用户添加是否获取其他服务待办功能

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/domain/User.java

@@ -116,6 +116,11 @@ public class User extends BaseEntity {
     private Boolean isAdmin;
 
     /**
+     * 是否获取其他服务待办
+     */
+    private String otherServiceFlag;
+
+    /**
      * 是否修改过密码,1为是
      */
     private String upPassword;

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -15,6 +15,7 @@
 		<result property="sign" column="sign" />
 		<result property="remarks" column="remarks" />
 		<result property="loginFlag" column="login_flag"/>
+		<result property="otherServiceFlag" column="other_service_flag"/>
 		<result property="manageOfficeIds" column="manage_office_ids"/>
         	<result property="loginIp" column="loginIp"/>
 		<result property="isAdmin" column="isAdmin"/>
@@ -54,6 +55,7 @@
 		a.login_date AS "loginDate",
 		a.remarks,
 		a.login_flag,
+		a.other_service_flag,
 		a.photo,
 		a.qr_code,
 		a.sign,
@@ -112,6 +114,7 @@
 		a.login_date AS "loginDate",
 		a.remarks,
 		a.login_flag,
+		a.other_service_flag,
 		a.photo,
 		a.qr_code,
 		a.sign,

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/dto/UserDTO.java

@@ -162,6 +162,11 @@ public class  UserDTO extends BaseDTO {
     private boolean isAdmin;
 
     /**
+     * 是否获取其他服务待办
+     */
+    private String otherServiceFlag;
+
+    /**
      * 根据角色查询用户条件
      */
     @Query(type = QueryType.EQ, javaField ="roleDTO.id", tableColumn = "r.id")

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/centerservice/service/ccpm/reimbursement/ReimbursementRequest.java

@@ -44,7 +44,7 @@ public class ReimbursementRequest {
         act.put("flag", flag);
         resp.put("act", act);
         resp.put("createBy", createBy);
-        Object res = restTemplateService.postCCPM("/a/workreimbursement/workReimbursement/saveAuditFunc", token, null, resp);
+        Object res = restTemplateService.postCCPM("/a/transpond/transpond/saveAuditFunc", token, null, resp);
         return res;
     }
 }

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -96,19 +96,24 @@ public class FlowableTaskController {
 
     @GetMapping("todo")
     public ResponseEntity todoListData(Page <ProcessVo> page, Flow flow) throws Exception {
+        //获取当前登陆人的信息
+        UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
         //各服务引用状态 =》 （若包含，则进行获取该服务的流程信息）
         String inquireStatus = Global.getConfig("INQUIRE_STATUS");
         Page <ProcessVo> pageList = flowTaskService.todoList(new Page<>(1, -1), flow);
         List<ProcessVo> list = new ArrayList<>();
         list.addAll(pageList.getRecords()); // 当前系统查询数据
-        if(inquireStatus.contains("ccpm")){
-            // 访问ccpm
-            Object response = flowRequest.getNotifyList(flow);
-            List<Map<String, Object>> res = JSONObject.parseArray(JSON.toJSONString(response));
-            // ccpm待办查询返回结果
-            List<ProcessVo> processVos = ConvertServiceUtil.convertProcessVoList(res);
-            // 整合全部查询结果
-            list.addAll(processVos); // ccpm返回数据
+        //判定如果当前登陆人是否可以查看其他服务的待办信息
+        if("1".equals(currentUserDTO.getOtherServiceFlag())){
+            if(inquireStatus.contains("ccpm")){
+                // 访问ccpm
+                Object response = flowRequest.getNotifyList(flow);
+                List<Map<String, Object>> res = JSONObject.parseArray(JSON.toJSONString(response));
+                // ccpm待办查询返回结果
+                List<ProcessVo> processVos = ConvertServiceUtil.convertProcessVoList(res);
+                // 整合全部查询结果
+                list.addAll(processVos); // ccpm返回数据
+            }
         }
         // 将整合后的结果排序后分页
         Page sortAndPaging = ConvertServiceUtil.getSortAndPaging(page, list);

jeeplus-web/src/main/resources/application-development.yml

@@ -255,8 +255,8 @@ code_type: 1
 #其他系统的地址
 CCPM_PATH:  http://localhost:8090
 #待办中展示其他系统的流程
-#ccpm =》 13 报销申请、39 项目登记
-CCPM_TASK:  13,39
+#ccpm =》 13、102 报销申请、39 项目登记
+CCPM_TASK:  13,102,39
 
 #各服务引用状态 =》 （若包含，则进行获取该服务的流程信息）
 INQUIRE_STATUS: ccpm