1.列表合并

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java

@@ -28,6 +28,11 @@ public class BaseController {
     @Autowired
     protected HttpServletRequest request;
 
+    public static final String COMPANY_TYPE_COMPANY = "company";
+
+    public static final String COMPANY_TYPE_SUPERVISION = "supervision";
+
+
     /**
      * 获取token
      **/

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

@@ -58,7 +58,7 @@
         <if test="dto.type == 'supervision'">
             AND ur.receive_org_code = #{orgCode}
         </if>
-        <if test="dto.type == 'enterprise' ">
+        <if test="dto.type == 'company'">
             and ur.use_unit_credit_code = #{orgCode}
         </if>
     </where>

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,6 +41,7 @@ public class JgChangeRegistrationNameController extends BaseController {
     @Autowired
     JgChangeRegistrationNameServiceImpl jgChangeRegistrationNameService;
 
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增/新增并提交", notes = "新增/新增并提交")
@@ -109,7 +111,13 @@ public class JgChangeRegistrationNameController extends BaseController {
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
-        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getList(dto, page, dto.getRoleIds()));
+        ReginParams reginParams = getSelectedOrgInfo();
+        if(reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)){
+            dto.setType(COMPANY_TYPE_COMPANY);
+        } else {
+            dto.setType(COMPANY_TYPE_SUPERVISION);
+        }
+        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getList(dto, page, dto.getRoleIds(),reginParams.getCompany().getOrgCode()));
     }
 
 

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/JgChangeRegistrationNameServiceImpl.java

@@ -598,16 +598,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         return map;
     }
 
-    public Page<Map<String, Object>> getList(JgChangeRegistrationNameDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String orgCode = reginParams.getCompany().getCompanyCode();
+    public Page<Map<String, Object>> getList(JgChangeRegistrationNameDto dto, Page<Map<String, Object>> page, List<String> roleIds, String orgCode) {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(dto.getReceiveOrgCode())) {
             String[] receiveOrgIdList = dto.getReceiveOrgCode().split("_");
             if (receiveOrgIdList.length > 1) {
                 dto.setReceiveOrgCode(receiveOrgIdList[0]);
             }
         }
-        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, orgCode);
-        return listPage;
+        return this.baseMapper.getListPage(page, dto, roleIds, orgCode);
     }
 }
\ No newline at end of file