From a43f56d0ec01a11647539eb9cb84a16092cde3b5 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Sun, 22 Nov 2020 15:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DgGuaranteeAssignUserController.java      | 10 ++++---
 .../guarantee/DgGuaranteeAssignUserMapper.xml |  2 +-
 .../daqing/framework/model/StatusCode.java    | 26 +++++++++++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/model/StatusCode.java

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java
index f13645da..5323f64e 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java
@@ -60,8 +60,8 @@ public class DgGuaranteeAssignUserController {
     public ResponseResult businessApplicationList(@RequestParam(value="page",required=false) Integer page, @RequestParam(value="size",required=false) Integer size,
                                                   @RequestParam(value = "CustomerNumberOrName", required = false) String CustomerNumberOrName){
         //获取当前登录用户userId
-        //String userId = dgApplyAmountInfoController.getUserId();
-        String userId = "5";
+        String userId = dgApplyAmountInfoController.getUserId();
+        //String userId = "5";
         //根据角色查询担保部调查列表
         String roleIds = RedisUtil.get("dq:userRole:" + userId);
         PageUtils data = null;
@@ -70,7 +70,9 @@ public class DgGuaranteeAssignUserController {
 
             List<String> roleIdlist = Arrays.asList(ids);
 
-            String A = String.valueOf(PromptSuccess.DB_A_ID);
+            data = dgGuaranteeAssignUserService.queryPage(page, size, CustomerNumberOrName, roleIdlist, userId);
+
+/*            String A = String.valueOf(PromptSuccess.DB_A_ID);
             String B = String.valueOf(PromptSuccess.DB_B_ID);
             //判断角色数组中是否包含A角或者B角元素
             Boolean f = Arrays.asList(ids).contains(A);
@@ -80,7 +82,7 @@ public class DgGuaranteeAssignUserController {
                 data = dgGuaranteeAssignUserService.queryPage(page, size, CustomerNumberOrName, roleIdlist, userId);
             } else {
                 data = dgGuaranteeAssignUserService.queryPage(page, size, CustomerNumberOrName, roleIdlist, null);
-            }
+            }*/
         }
 
         return new ResponseResult<PageUtils>().SUCCESS(data);
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml
index 2a6503b8..a1b7279e 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml
@@ -32,7 +32,7 @@
                 #{id}
             </foreach>
             <if test="userId != null and userId != ''">
-                AND au.emp_id =#{userId}
+                AND au.emp_id =#{userId} or au.emp_id is null
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
                 AND ai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')
diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/StatusCode.java b/dq-framework-common/src/main/java/com/daqing/framework/model/StatusCode.java
new file mode 100644
index 00000000..8a7924df
--- /dev/null
+++ b/dq-framework-common/src/main/java/com/daqing/framework/model/StatusCode.java
@@ -0,0 +1,26 @@
+package com.daqing.framework.model;
+
+/**
+ * 状态码
+ *
+ * @auther River
+ * @date 2020/9/27 11:56
+ */
+public class StatusCode {
+
+    public static final Integer TO_BE_ASSIGNED = 0;//待指派
+
+    public static final Integer IN_REVIEW = 1;//审核中
+
+    public static final Integer REVIEWED = 2;//已审核
+
+    public static final Integer REFUSE = 3;//拒绝
+
+    public static final Integer REJECT = 4;//驳回
+
+    public static final Integer RESCINDED = 5;//已撤销
+
+    public static final Integer DRAFT = 6;//草稿
+
+
+}