流程和人员权限调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/xml/ContractInfoMapper.xml

@@ -27,7 +27,7 @@
 
     <select id="findPageList" resultType="com.jeeplus.test.cw.contractRegistration.domain.ContractInfo">
         SELECT
-			a.id,
+        DISTINCT a.id,
 			c.`name` AS create_by,
 			c.`id` AS createId,
 			a.create_date,
@@ -73,6 +73,7 @@
 			cw_work_contract_info a
             LEFT JOIN cw_work_contract_file b on a.id = b.contract_info_id
             LEFT JOIN sys_user c ON a.create_by = c.id
+            left join sys_user_manage_office sumo on sumo.office_id = c.office_id
             LEFT JOIN act_ru_task e ON b.proc_ins_id = e.PROC_INST_ID_
             LEFT JOIN sys_office d on a.department = d.id
             LEFT JOIN cw_work_contract_borrow f ON a.id = f.contract_info_id
@@ -80,9 +81,6 @@
             LEFT JOIN cw_work_contract_file_paper h on a.id = h.contract_info_id
             LEFT JOIN cw_work_client_base cw_wcb on a.client_contacts = cw_wcb.id and cw_wcb.del_flag = '0'
 		${ew.customSqlSegment}
-        <if test="officeIds !=null and officeIds != ''">
-            and c.office_id in (${officeIds})
-        </if>
 		ORDER BY a.update_date DESC
     </select>
     <select id="findById" resultType="com.jeeplus.test.cw.contractRegistration.domain.ContractInfo">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/service/ContractInfoService.java

@@ -151,7 +151,7 @@ public class ContractInfoService {
         List<String> manageOfficeIdList= Lists.newArrayList();
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         //判定是否为会计所长
-        if(CommonUtils.haveRoleKjsz()){
+        /*if(CommonUtils.haveRoleKjsz()){
             //获取当前人管理的部门id
             if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
                 manageOfficeIdList = Arrays.asList(userDTO.getManageOfficeIds().split(","));
@@ -164,12 +164,7 @@ public class ContractInfoService {
                     officeIds.append(",");
                 }
             }
-            /*if("兴光审计一部".equals(userDTO.getOfficeDTO().getName())){  //兴光审计一部
-                officeIds = "'" + userDTO.getOfficeDTO().getId() + "','1602840212125847554'";   //添加驻外分部部门id信息
-            }else if("兴光审计二部".equals(userDTO.getOfficeDTO().getName())){    //兴光审计二部
-                officeIds = "'" + userDTO.getOfficeDTO().getId() + "'";
-            }*/
-        }
+        }*/
 
         IPage<ContractInfo> pageList = mapper.findPageList(page, officeIds.toString(), wrapper);
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -221,16 +221,15 @@
     </select>
     <select id="findList" resultMap="BaseResultMap">
         select
+        DISTINCT
         <include refid="Base_Column_List"></include>,
         su.name as operator,
         so.name as operator_office
         from cw_finance_invoice fi
         left join sys_user su on fi.create_by = su.id and su.del_flag = '0'
+        left join sys_user_manage_office sumo on sumo.office_id = su.office_id
         left join sys_office so on su.office_id = so.id and so.del_flag = '0'
         ${ew.customSqlSegment}
-        <if test="officeIds !=null and officeIds != ''">
-            and su.office_id in (${officeIds})
-        </if>
         ORDER BY
         fi.create_date DESC
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/service/CwFinanceInvoiceService.java

@@ -257,7 +257,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
         //判定是否为会计所长
-        if(CommonUtils.haveRoleKjsz()){
+        /*if(CommonUtils.haveRoleKjsz()){
             //获取当前人管理的部门id
             if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
                 manageOfficeIdList = Arrays.asList(userDTO.getManageOfficeIds().split(","));
@@ -270,12 +270,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                     officeIds.append(",");
                 }
             }
-            /*if("兴光审计一部".equals(userDTO.getOfficeDTO().getName())){  //兴光审计一部
-                officeIds = "'" + userDTO.getOfficeDTO().getId() + "','1602840212125847554'";   //添加驻外分部部门id信息
-            }else if("兴光审计二部".equals(userDTO.getOfficeDTO().getName())){    //兴光审计二部
-                officeIds = "'" + userDTO.getOfficeDTO().getId() + "'";
-            }*/
-        }
+        }*/
         return cwFinanceInvoiceMapper.findList(page,queryWrapper,officeIds.toString());
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -27,7 +27,7 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
      * @param queryWrapper
      * @return
      */
-    IPage<CwProjectRecordsDTO> findList(Page<CwProjectRecordsDTO> page,@Param("currentUser") UserDTO currentUser,@Param("isBmzr") String isBmzr,@Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper<CwProjectRecords> queryWrapper);
+    IPage<CwProjectRecordsDTO> findList(Page<CwProjectRecordsDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwProjectRecords> queryWrapper);
     /**
      * 根据id查询项目详情
      * @param id

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -216,8 +216,9 @@
     </select>
 
 
-    <select id="findList" resultMap="BaseResultMap">
+    <!--<select id="findList" resultMap="BaseResultMap">
         select
+        DISTINCT
         <include refid="Base_Column_List"></include>,
         su.name as user_name,
         su2.name as project_master_name,
@@ -232,6 +233,7 @@
         b.member_count
         from cw_project_records a
         left join sys_user su on su.id = a.create_by and su.del_flag = '0'
+        left join sys_user_manage_office sumo on sumo.office_id = su.office_id
         left join sys_user su2 on su2.id = a.project_master_id and su2.del_flag = '0'
         left join sys_user su3 on su3.id = a.real_header and su3.del_flag = '0'
         left join cw_work_contract_info cw_wci on cw_wci.id = a.contract_id and cw_wci.del_flag = '0'
@@ -261,11 +263,43 @@
                 where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
                 ))
             </if>
-            <if test="isBmzr == 'one'.toString and officeIds != ''">
-                and su.office_id in (${officeIds})
-            </if>
         </if>
         ORDER BY a.create_date DESC
+    </select>-->
+
+
+    <select id="findList" resultMap="BaseResultMap">
+        select
+        DISTINCT
+        <include refid="Base_Column_List"></include>,
+        su.name as user_name,
+        su2.name as project_master_name,
+        su3.name as real_header_name,
+        cw_wci.contract_name,
+        cw_wci.contract_amount,
+        cw_wci.contract_num,
+        cw_wci.payer_subject,
+        cw_wci.payment_method,
+        cw_wcb.name as client_contacts_name,
+        cw_pbt.name as business_type_name,
+        b.member_count
+        from cw_project_records a
+        left join sys_user su on su.id = a.create_by and su.del_flag = '0'
+        left join sys_user su2 on su2.id = a.project_master_id and su2.del_flag = '0'
+        left join sys_user su3 on su3.id = a.real_header and su3.del_flag = '0'
+        left join cw_work_contract_info cw_wci on cw_wci.id = a.contract_id and cw_wci.del_flag = '0'
+        left join cw_work_client_base cw_wcb on cw_wci.client_contacts = cw_wcb.id and cw_wcb.del_flag = '0'
+        left join cw_project_business_type cw_pbt on cw_pbt.id = a.business_type and cw_pbt.del_flag = '0'
+        left join (select rec.id,count(cw_pm.id) as member_count
+                    from cw_project_records rec
+                    left join cw_project_members cw_pm on cw_pm.project_id = rec.id and cw_pm.del_flag = '0'
+                    group by rec.id
+                    ) b on b.id = a.id
+        left join cw_project_members cpm on a.id = cpm.project_id
+        left join sys_user sub on cpm.user_id = sub.id
+        left join sys_user_manage_office sumo on sumo.office_id = sub.office_id
+        ${ew.customSqlSegment}
+        ORDER BY a.create_date DESC
     </select>
 
     <select id="queryById" resultMap="BaseResultMap">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/CwProjectRecordsService.java

@@ -110,47 +110,8 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 queryWrapper.eq("a.create_by", cwProjectRecordsDTO.getCreateId());
             }
         }
-        // 如果当前用户是部门主任，则可以查看部门所有的项目、自己创建的项目以及所属项目组的项目
-        // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目
-        String isBmzr = "0";
-        StringBuilder officeIds = new StringBuilder();
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        List<String> manageOfficeIdList= Lists.newArrayList();
-        if (CommonUtils.haveRoleCwBmzr()) {
-            // 财务_部门主任展示自己所属项目、自己创建的项目、自己部门下的项目
-            isBmzr = "1";
-        } else if (CommonUtils.haveRoleCwYg() || CommonUtils.haveRoleXmYg()) {
-            // 财务_员工(或项目员工)展示自己所属项目、自己创建的项目
-            isBmzr = "0";
-        } else {
-            //判定是否为会计所长
-            if(CommonUtils.haveRoleKjsz()){
-                isBmzr = "one";
-                //获取当前人管理的部门id
-                if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
-                    manageOfficeIdList = Arrays.asList(userDTO.getManageOfficeIds().split(","));
-                }else{
-                    manageOfficeIdList.add(userDTO.getOfficeDTO().getId());
-                }
-                for (int i = 0; i <manageOfficeIdList.size(); i++){
-                    officeIds.append("'").append(manageOfficeIdList.get(i)).append("'");
-                    if(i < manageOfficeIdList.size()-1){
-                        officeIds.append(",");
-                    }
-                }
-                /*if("兴光审计一部".equals(userDTO.getOfficeDTO().getName())){  //兴光审计一部
-                    isBmzr = "one";
-                    officeIds = "'" + userDTO.getOfficeDTO().getId() + "','1602840212125847554'";   //添加驻外分部部门id信息
-                }else if("兴光审计二部".equals(userDTO.getOfficeDTO().getName())){    //兴光审计二部
-                    isBmzr = "one";
-                    officeIds = "'" + userDTO.getOfficeDTO().getId() + "'";
-                }*/
-            }else{
-                // 其他人默认展示全部数据
-                isBmzr = "2";
-            }
-        }
-        IPage<CwProjectRecordsDTO> list = cwProjectRecordsMapper.findList(page,userDTO,isBmzr, officeIds.toString(), queryWrapper);
+
+        IPage<CwProjectRecordsDTO> list = cwProjectRecordsMapper.findList(page, queryWrapper);
         return list;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportController.java

@@ -255,7 +255,7 @@ public class CwProjectReportController {
     public ResponseEntity<String> saveData(@Valid @RequestBody CwProjectReportData cwProjectReportData) {
         if ("3".equals(cwProjectReportData.getSignatureType())) {
             // 实体公章流程
-            String signatureId = projectReportService.getSignature(cwProjectReportData.getId());
+            String signatureId = projectReportService.getSignature(cwProjectReportData);
             return ResponseUtil.newInstance().add("businessTable", "cw_project_report_signature").add("businessId", signatureId).ok ("操作成功");
         } else {
             //查询报告文件信息（电子章）
@@ -265,13 +265,13 @@ public class CwProjectReportController {
                 Map<String, Object> signatureContractId = projectReportService.createSignatureContractId(cwProjectReportData);
                 boolean bool = (boolean)signatureContractId.get("success");
                 if (bool) {
-                    String signatureId = projectReportService.getSignature(cwProjectReportData.getId());
+                    String signatureId = projectReportService.getSignature(cwProjectReportData);
                     return ResponseUtil.newInstance().add("businessTable", "cw_project_report_signature").add("businessId", signatureId).ok ("操作成功");
                 }
                 return ResponseEntity.badRequest().body((String) signatureContractId.get("message"));
             } else {
                 // 没有电子章的附件时，走正常审核流程
-                String signatureId = projectReportService.getSignature(cwProjectReportData.getId());
+                String signatureId = projectReportService.getSignature(cwProjectReportData);
                 return ResponseUtil.newInstance().add("businessTable", "cw_project_report_signature").add("businessId", signatureId).ok ("操作成功");
             }
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportSignatureCallBackController.java

@@ -119,7 +119,7 @@ public class CwProjectReportSignatureCallBackController {
                         reportSignature.setSignatureAnnotator2Status("1");
                         cwProjectReportService.updateSignatureType(reportSignature);
                         break;
-                    case "签章管理人审核":
+                    case "签章管理员审核":
                         reportSignature.setSealAdminStatus("1");
                         cwProjectReportService.updateSignatureType(reportSignature);
                         break;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/CwProjectReportMapper.java

@@ -149,4 +149,10 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
     String getServedUnitName(String id);
 
     String getOfficeId(String name);
+
+    /**
+     * 根据id修改报告的盖章类型
+     * @param cwProjectReportData
+     */
+    void updateSignatureTypeById(CwProjectReportData cwProjectReportData);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -39,7 +39,7 @@
 
     <select id="findList" resultType="com.jeeplus.test.cw.projectReport.domain.CwProjectReportData">
         SELECT
-        a.id,
+        DISTINCT a.id,
         a.create_by as createById,
         a.create_date,
         a.update_by,
@@ -63,7 +63,6 @@
         b.project_master_id as projectMasterId,
         c.name as departmentName,
         d.name as userName,
-        a.create_date,
         a.audit_fees,
         e.name as projectMasterName,
         cw_prs1.proc_ins_id as proc_ins_id1,
@@ -91,32 +90,10 @@
         LEFT JOIN cw_project_report_signature cw_prs3 on cw_prs3.report_id = a.id and cw_prs3.type = '3' and cw_prs3.del_flag = '0'
         left join cw_project_report_new_line new_line on a.id = new_line.report_id and new_line.del_flag = '0'
         left join cw_project_report_review cw_rev on a.id = cw_rev.report_id and cw_rev.del_flag = '0'
+        left join cw_project_members cpm on b.id = cpm.project_id
+        left join sys_user sub on cpm.user_id = sub.id
+        left join sys_user_manage_office sumo on sumo.office_id = sub.office_id
         ${ew.customSqlSegment}
-        <if test="currentUser.id != '1'.toString">
-            <if test="isBmzr == '0'.toString">
-                and (a.create_by = #{currentUser.id} or b.id in (
-                select cw_pm.project_id
-                from cw_project_members cw_pm
-                where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
-                ))
-            </if>
-            <if test="isBmzr == '1'.toString">
-                and (a.create_by in (
-                select su.id from sys_user su where su.del_flag = '0' and su.office_id in
-                (select so.id from sys_office so where so.id = #{currentUser.officeDTO.id} or so.parent_ids like concat('%',#{currentUser.officeDTO.id},'%') and so.del_flag = '0')
-                ) or b.id in (
-                select cw_pm.project_id
-                from cw_project_members cw_pm
-                where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
-                ))
-            </if>
-            <if test="isBmzr == '3'.toString">
-                and cw_rev.review_by = #{currentUser.id} and cw_rev.review_status != '0' and cw_rev.review_status != '1'
-            </if>
-            <if test="isBmzr == 'one'.toString and officeIds != ''">
-                and d.office_id in (${officeIds})
-            </if>
-        </if>
         ORDER BY a.create_date DESC
     </select>
     <select id="queryById" resultType="com.jeeplus.test.cw.projectReport.domain.CwProjectReportData">
@@ -492,4 +469,10 @@
     <select id="getOfficeId" resultType="java.lang.String">
         select id from sys_office where name = #{name}
     </select>
+
+    <update id="updateSignatureTypeById">
+        update cw_project_report set
+        signature_type = #{signatureType}
+        where id = #{id}
+    </update>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -471,53 +471,6 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         StringBuilder officeIds = new StringBuilder();
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
-        if (CommonUtils.haveRoleCwBmzr()) {
-            if (CommonUtils.haveRoleZkbzr()) {
-                // 质控部主任展示全部报告
-                isBmzr = "2";
-            } else {
-                // 财务_部门主任展示自己所属项目、自己创建的报告、自己部门下的报告
-                isBmzr = "1";
-            }
-        } else if (CommonUtils.haveRoleCwYg()) {
-            if (CommonUtils.haveRoleZkbyg()) {
-                // 质控部员工展示自己审核过的报告
-                isBmzr = "3";
-            } else {
-                // 财务_员工展示自己所属项目、自己创建的报告
-                isBmzr = "0";
-            }
-        } else if (CommonUtils.haveRoleZjzcy()) {
-            // 专家组成员展示自己审核过的报告
-            isBmzr = "3";
-        } else {
-            //判定是否为会计所长
-            if(CommonUtils.haveRoleKjsz()){
-                isBmzr = "one";
-                //获取当前人管理的部门id
-                if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
-                    manageOfficeIdList = Arrays.asList(userDTO.getManageOfficeIds().split(","));
-                }else{
-                    manageOfficeIdList.add(userDTO.getOfficeDTO().getId());
-                }
-                for (int i = 0; i <manageOfficeIdList.size(); i++){
-                    officeIds.append("'").append(manageOfficeIdList.get(i)).append("'");
-                    if(i < manageOfficeIdList.size()-1){
-                        officeIds.append(",");
-                    }
-                }
-                /*if("兴光审计一部".equals(userDTO.getOfficeDTO().getName())){  //兴光审计一部
-                    isBmzr = "one";
-                    officeIds = "'" + userDTO.getOfficeDTO().getId() + "','1602840212125847554'";   //添加驻外分部部门id信息
-                }else if("兴光审计二部".equals(userDTO.getOfficeDTO().getName())){    //兴光审计二部
-                    isBmzr = "one";
-                    officeIds = "'" + userDTO.getOfficeDTO().getId() + "'";
-                }*/
-            }else{
-                // 其他人默认展示全部数据
-                isBmzr = "2";
-            }
-        }
 
 
         IPage<CwProjectReportData> list = reportMapper.findList(page,userDTO,isBmzr, officeIds.toString(), queryWrapper);
@@ -2085,7 +2038,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
         //根据角色信息录入签署方信息
         //负责人
-        List<UserDTO> userInfoByRoleNameList = userService.getUserInfoByRoleName("签章管理人");
+        List<UserDTO> userInfoByRoleNameList = userService.getUserInfoByEnName("qzglr");
         if(userInfoByRoleNameList.size()>0){
 
             UserDTO user = UserUtils.get(userInfoByRoleNameList.get(0).getId());
@@ -2301,15 +2254,17 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         return "操作成功";
     }
 
-    public String getSignature (String reportId){
-        CwProjectReportData cwProjectReportData1 = this.queryById(reportId);
-        String signatureType = cwProjectReportData1.getSignatureType();
+    public String getSignature (CwProjectReportData cwProjectReportData){
+        CwProjectReportData cwProjectReportData1 = this.queryById(cwProjectReportData.getId());
+        String signatureType = cwProjectReportData.getSignatureType();
         CwProjectReportSignature cwProjectReportSignature = cwProjectReportSignatureMapper.selectOne(new QueryWrapper<CwProjectReportSignature>().lambda()
-                .eq(CwProjectReportSignature::getReportId, reportId)
+                .eq(CwProjectReportSignature::getReportId, cwProjectReportData.getId())
                 .eq(CwProjectReportSignature::getType, signatureType)
         );
         cwProjectReportSignature.setStatus("2");
         cwProjectReportSignatureMapper.updateById(cwProjectReportSignature);
+        //修改盖章类型
+        reportMapper.updateSignatureTypeById(cwProjectReportData);
         return cwProjectReportSignature.getId();
     }
 
@@ -2555,7 +2510,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 case "签字注师2审核":
                     map.put("signatureType", reportSignatureInfo.getSignatureAnnotator2Status());
                     break;
-                case "签章管理人审核":
+                case "签章管理员审核":
                     map.put("signatureType", reportSignatureInfo.getSealAdminStatus());
                     break;
             }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -221,6 +221,7 @@
 
     <select id="findList" resultMap="BaseResultMap">
         select
+        DISTINCT
         <include refid="Base_Column_List"></include>,
         cw_wcb.name as audited_units_name,
         su.name as user_name,
@@ -235,6 +236,11 @@
         left join cw_project_records cw_pr on cw_pr.id = cw_pa.project_id and cw_pr.del_flag = '0'
         left join sys_user su1 on cw_pr.project_master_id = su1.id and su1.del_flag = '0'
         left join cw_project_report_new_line cw_prnl on cw_prnl.report_id = cw_pa.report_id and cw_prnl.del_flag = '0'
+
+        left join cw_project_members cpm on cw_pr.id = cpm.project_id
+        left join sys_user sub on cpm.user_id = sub.id
+        left join sys_user_manage_office sumo on sumo.office_id = sub.office_id
+
         ${ew.customSqlSegment}
         and cw_prnl.report_number is not null and cw_prnl.report_date is not null
         <if test="sta == '超期未归档'">
@@ -249,28 +255,7 @@
         <if test="sta == '已按时归档'">
             and cw_pa.audit_date is not null and timestampdiff(day,cw_prnl.report_date,cw_pa.audit_date) &lt;= 60
         </if>
-        <if test="currentUser.id != '1'.toString">
-            <if test="isBmzr == '0'.toString">
-                and (cw_pa.create_by = #{currentUser.id} or cw_pa.project_id in (
-                select cw_pm.project_id
-                from cw_project_members cw_pm
-                where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
-                ))
-            </if>
-            <if test="isBmzr == '1'.toString">
-                and (cw_pa.create_by in (
-                select su.id from sys_user su where su.del_flag = '0' and su.office_id in
-                (select so.id from sys_office so where so.id = #{currentUser.officeDTO.id} or so.parent_ids like concat('%',#{currentUser.officeDTO.id},'%') and so.del_flag = '0')
-                ) or cw_pa.project_id in (
-                select cw_pm.project_id
-                from cw_project_members cw_pm
-                where cw_pm.user_id = #{currentUser.id} and cw_pm.del_flag = '0' and cw_pm.status = '0'
-                ))
-            </if>
-            <if test="isBmzr == 'one'.toString and officeIds != ''">
-                and su.office_id in (${officeIds})
-            </if>
-        </if>
+
         ORDER BY cw_pa.create_date DESC
     </select>
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -135,40 +135,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
         StringBuilder officeIds = new StringBuilder();
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
-        if (CommonUtils.haveRoleCwBmzr()) {
-            // 财务_部门主任展示自己所属项目、自己创建的报告、自己部门下的报告
-            isBmzr = "1";
-        } else if (CommonUtils.haveRoleCwYg()) {
-            // 财务_员工展示自己所属项目、自己创建的报告
-            isBmzr = "0";
-        } else {
-            //判定是否为会计所长
-            if(CommonUtils.haveRoleKjsz()){
-                isBmzr = "one";
-                //获取当前人管理的部门id
-                if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
-                    manageOfficeIdList = Arrays.asList(userDTO.getManageOfficeIds().split(","));
-                }else{
-                    manageOfficeIdList.add(userDTO.getOfficeDTO().getId());
-                }
-                for (int i = 0; i <manageOfficeIdList.size(); i++){
-                    officeIds.append("'").append(manageOfficeIdList.get(i)).append("'");
-                    if(i < manageOfficeIdList.size()-1){
-                        officeIds.append(",");
-                    }
-                }
-                /*if("兴光审计一部".equals(userDTO.getOfficeDTO().getName())){  //兴光审计一部
-                    isBmzr = "one";
-                    officeIds = "'" + userDTO.getOfficeDTO().getId() + "','1602840212125847554'";   //添加驻外分部部门id信息
-                }else if("兴光审计二部".equals(userDTO.getOfficeDTO().getName())){    //兴光审计二部
-                    isBmzr = "one";
-                    officeIds = "'" + userDTO.getOfficeDTO().getId() + "'";
-                }*/
-            }else{
-                // 其他人默认展示全部数据
-                isBmzr = "2";
-            }
-        }
+
         if (StringUtils.isBlank(cwProjectReportArchiveDTO.getArchiveSta())) {
             cwProjectReportArchiveDTO.setArchiveSta("");
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/mapper/xml/CwReimbursementInfoMapper.xml

@@ -10,7 +10,7 @@
 	<select id="findList"
             resultType="com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.RetureListDto">
         SELECT
-			a.id,
+		DISTINCT a.id,
 			a.`no`,
 			(CASE
 			WHEN a.source_type = 1 THEN b.type_id
@@ -103,12 +103,10 @@
 			left join sys_user us5 on us5.id = b5.user_id and us5.del_flag = 0
 
 			LEFT JOIN sys_user c ON a.create_by =  c.id
+			left join sys_user_manage_office sumo on sumo.office_id = c.office_id
 			LEFT JOIN act_ru_task d ON a.proc_ins_id = d.PROC_INST_ID_
 			left join material_management_pruchase_request_basics pru on pru.id = a.purchase_id and pru.del_flag = '0'
 			${ew.customSqlSegment}
-			<if test="officeIds !=null and officeIds != ''">
-				and c.office_id in (${officeIds})
-			</if>
 		ORDER BY a.update_date DESC
     </select>
 	<select id="findFiles" resultType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -187,7 +187,7 @@ public class CwReimbursementInfoService {
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
         //判定是否为会计所长 或会计部门主任
-        if(CommonUtils.haveRoleKjsz() || CommonUtils.haveRoleCwBmzr()){
+        /*if(CommonUtils.haveRoleKjsz() || CommonUtils.haveRoleCwBmzr()){
             //获取当前人管理的部门id
             if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
                 manageOfficeIdList = Arrays.asList(userDTO.getManageOfficeIds().split(","));
@@ -200,12 +200,7 @@ public class CwReimbursementInfoService {
                     officeIds.append(",");
                 }
             }
-            /*if("兴光审计一部".equals(userDTO.getOfficeDTO().getName())){  //兴光审计一部
-                officeIds = new StringBuilder("'" + userDTO.getOfficeDTO().getId() + "','1602840212125847554'");   //添加驻外分部部门id信息
-            }else if("兴光审计二部".equals(userDTO.getOfficeDTO().getName())){    //兴光审计二部
-                officeIds = new StringBuilder("'" + userDTO.getOfficeDTO().getId() + "'");
-            }*/
-        }
+        }*/
         return infoMapper.findList(page, queryWrapper, officeIds.toString());
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/mapper/xml/ReportCancellApplyMapper.xml

@@ -45,7 +45,7 @@
     </select>
     <select id="getList" resultType="com.jeeplus.test.cw.reportCancellApply.service.dto.ReportInfoDto">
         SELECT
-        a.id,
+        DISTINCT a.id,
         a.create_by as createById,
         a.create_date,
         a.update_by,
@@ -80,6 +80,7 @@
         on c.office_id = e.id
 				LEFT JOIN sys_user f
         on a.create_by = f.id
+        left join sys_user_manage_office sumo on sumo.office_id = f.office_id
 				LEFT JOIN sys_user g
         on d.project_master_id = g.id
         LEFT JOIN sys_user h
@@ -87,9 +88,6 @@
         left join cw_project_report_cancell_apply_archived cw_ar
         on a.id = cw_ar.archive_id
         ${ew.customSqlSegment}
-        <if test="officeIds !=null and officeIds != ''">
-            and c.office_id in (${officeIds})
-        </if>
         order by a.create_date desc
     </select>
     <select id="selectByArchivedId"

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/ReportCancellApplyService.java

@@ -98,26 +98,6 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
         StringBuilder officeIds = new StringBuilder();
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
-        //判定是否为会计所长 或会计部门主任
-        if(CommonUtils.haveRoleKjsz()){
-            //获取当前人管理的部门id
-            if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
-                manageOfficeIdList = Arrays.asList(userDTO.getManageOfficeIds().split(","));
-            }else{
-                manageOfficeIdList.add(userDTO.getOfficeDTO().getId());
-            }
-            for (int i = 0; i <manageOfficeIdList.size(); i++){
-                officeIds.append("'").append(manageOfficeIdList.get(i)).append("'");
-                if(i < manageOfficeIdList.size()-1){
-                    officeIds.append(",");
-                }
-            }
-            /*if("兴光审计一部".equals(userDTO.getOfficeDTO().getName())){  //兴光审计一部
-                officeIds = new StringBuilder("'" + userDTO.getOfficeDTO().getId() + "','1602840212125847554'");   //添加驻外分部部门id信息
-            }else if("兴光审计二部".equals(userDTO.getOfficeDTO().getName())){    //兴光审计二部
-                officeIds = new StringBuilder("'" + userDTO.getOfficeDTO().getId() + "'");
-            }*/
-        }
         IPage<ReportInfoDto> list = applyMapper.getList(page, queryWrapper,officeIds.toString());
         return list;
     }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApplyArchived/mapper/xml/ReportCancellApplyArchivedMapper.xml

@@ -52,6 +52,7 @@
 
     <select id="getList" resultType="com.jeeplus.test.cw.reportCancellApplyArchived.service.dto.ArchivedReportInfoDto">
         SELECT
+        DISTINCT
         cw_ar.create_by as createId,
         a.id,
         a.create_by as createById,
@@ -88,6 +89,7 @@
         on c.office_id = e.id
 				LEFT JOIN sys_user f
         on a.create_by = f.id
+        left join sys_user_manage_office sumo on sumo.office_id = f.office_id
 				LEFT JOIN sys_user g
         on d.project_master_id = g.id
         LEFT JOIN sys_user h

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApplyArchived/service/ReportCancellApplyArchivedService.java

@@ -106,26 +106,6 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
         StringBuilder officeIds = new StringBuilder();
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
-        //判定是否为会计所长 或会计部门主任
-        if(CommonUtils.haveRoleKjsz()){
-            //获取当前人管理的部门id
-            if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
-                manageOfficeIdList = Arrays.asList(userDTO.getManageOfficeIds().split(","));
-            }else{
-                manageOfficeIdList.add(userDTO.getOfficeDTO().getId());
-            }
-            for (int i = 0; i <manageOfficeIdList.size(); i++){
-                officeIds.append("'").append(manageOfficeIdList.get(i)).append("'");
-                if(i < manageOfficeIdList.size()-1){
-                    officeIds.append(",");
-                }
-            }
-            /*if("兴光审计一部".equals(userDTO.getOfficeDTO().getName())){  //兴光审计一部
-                officeIds = new StringBuilder("'" + userDTO.getOfficeDTO().getId() + "','1602840212125847554'");   //添加驻外分部部门id信息
-            }else if("兴光审计二部".equals(userDTO.getOfficeDTO().getName())){    //兴光审计二部
-                officeIds = new StringBuilder("'" + userDTO.getOfficeDTO().getId() + "'");
-            }*/
-        }
         IPage<ArchivedReportInfoDto> list = applyMapper.getList(page, queryWrapper,officeIds.toString());
         return list;
     }

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

@@ -157,6 +157,14 @@ public interface UserMapper extends BaseMapper<User> {
     List <UserDTO> getUserInfoByRoleName(String roleName);
 
     /**
+     * 根据角色英文名称查询角色下人员信息
+     *
+     * @param enName 角色名称
+     * @return
+     */
+    List <UserDTO> getUserInfoByEnName(String enName);
+
+    /**
      * 根据人员名称查询人员信息
      *
      * @param name 名称

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

@@ -438,6 +438,15 @@ public class UserService  extends ServiceImpl<UserMapper, User> {
 		return userMapper.getUserInfoByRoleName(roleName);
 	}
 
+	/**
+	 * 根据角色英文名称查询角色下人员信息
+	 * @param enName 角色英文名称
+	 * @return
+	 */
+	public List<UserDTO> getUserInfoByEnName(String enName){
+		return userMapper.getUserInfoByEnName(enName);
+	}
+
 	public Boolean isUpdatePassword(String userId) {
 		String updatePassword = userMapper.isUpdatePassword(userId);
 		if (StringUtils.isNotBlank(updatePassword)) {