列表合并

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -50,12 +50,12 @@
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
                 and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
-            <if test="roleIds != null and dto.dataType == 'jg'">
+            <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
-            <if test="dto.dataType == 'jg' ">
+            <if test="dto.dataType == 'supervision' ">
                 and  ur.receive_company_code = #{dto.unitCode}
             </if>
             <if test="dto.dataType == 'company' ">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -87,6 +87,12 @@ public class JgUseRegistrationController extends BaseController {
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
+        ReginParams info = getSelectedOrgInfo();
+        if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
+            dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
+        }else {
+            dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
+        }
         return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getList(dto, page,  dto.getRoleIds()));
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -171,8 +171,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
             jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]);
 
-        } else {
-            jgUseRegistration.setReceiveCompanyCode("610000");
         }
         // 使用单位提交
         jgUseRegistration.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());