列表合并后后端代码调整

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

@@ -46,16 +46,16 @@
             <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' ">
-                and  ur.receive_org_code = #{dto.unitCode}
+            <if test="dto.dataType == 'supervision' ">
+                and  ur.receive_org_code = #{dto.receiveOrgCode}
             </if>
             <if test="dto.dataType == 'company' ">
-                and  ur.use_unit_credit_code = #{dto.unitCode}
+                and  ur.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
         </where>
         order by ur.rec_date desc

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

@@ -95,6 +95,14 @@ public class JgChangeRegistrationReformController extends BaseController {
 															@RequestParam(value = "current") int current,
 															@RequestParam(value = "size") int size) {
 		Page<Map<String, Object>> page = new Page<>(current, size);
+		ReginParams reginParams = getSelectedOrgInfo();
+		if(reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)){
+			dto.setDataType(COMPANY_TYPE_COMPANY);
+			dto.setUnitCode(reginParams.getCompany().getCompanyCode());
+		} else {
+			dto.setDataType(COMPANY_TYPE_SUPERVISION);
+			dto.setReceiveOrgCode(reginParams.getCompany().getCompanyCode());
+		}
 		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getList(dto, page,  dto.getRoleIds()));
 	}