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 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().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} - AND au.emp_id =#{userId} + AND au.emp_id =#{userId} or au.emp_id is null 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;//草稿 + + +}