Merge branch 'develop_tzs_register' of…

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

@@ -68,11 +68,11 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND (isn.receive_org_code = #{orgCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                AND (isn.receive_org_code = #{companyCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
                 AND isn.instance_id <![CDATA[<>]]>  ''
             </if>
             <if test="type == 'enterprise'">
-                AND (isn.new_use_unit_credit_code = #{orgCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                AND (isn.new_use_unit_credit_code = #{companyCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
             </if>
             <if test="roleIds != null and type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>

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

@@ -680,7 +680,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         String companyType = reginParams.getCompany().getCompanyType();
         String currentUserId = reginParams.getUserModel().getUserId();
         SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
-        Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page, sortMap, model, type, orgCode, model.getRoleIds(), currentUserId, orgCode);
+        Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page, sortMap, model, type, companyCode, model.getRoleIds(), currentUserId, orgCode);
 
         Page<JgChangeRegistrationUnitDto> noticeDtoPage = new Page<>();
         BeanUtils.copyProperties(noticePage, noticeDtoPage, "records");

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

@@ -215,7 +215,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         List<Map<String, Object>> arrayList = new ArrayList<>();
         equips.forEach(equip -> {
             Map<String, Object> objectHashMap = new HashMap<>();
-            BeanUtil.beanToMap(equip, objectHashMap, false, false);
+            BeanUtil.beanToMap(equip, objectHashMap, false, true);
             objectHashMap.put("record", equip.getSEQUENCE_NBR());
             objectHashMap.put("ADDRESS", concatDetailAddress(equip));
             arrayList.add(objectHashMap);

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

@@ -218,10 +218,10 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
 
     private String buildAllRiskDisposalUnitOrgCode(String defaultOrgCode, Long sequenceNbr) {
         if (!ObjectUtils.isEmpty(sequenceNbr)) {
-            String riskDisposalUnitOrgCode = riskReportMapper.getRiskDisposalUnitOrgCode(sequenceNbr);
-            if (!ObjectUtils.isEmpty(riskDisposalUnitOrgCode)) {
+            String allRiskDisposalUnitOrgCode = riskReportMapper.getRiskDisposalUnitOrgCode(sequenceNbr);
+            if (!ObjectUtils.isEmpty(allRiskDisposalUnitOrgCode)) {
                 return String.join(",", Stream.concat(
-                                Arrays.stream(riskDisposalUnitOrgCode.split(",")),
+                        Arrays.stream(allRiskDisposalUnitOrgCode.split(",")),
                                 Stream.of(defaultOrgCode)
                         ).collect(Collectors.toSet())
                 );
@@ -370,7 +370,7 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
                 .operationCompanySeq(company.getSequenceNbr().toString())
                 .operationCompanyName(company.getCompanyName())
                 .operationUserId(userModel.getUserId())
-                .operationUserName(userModel.getUserName())
+                .operationUserName(userModel.getRealName())
                 .createDate(new Date())
                 .createUserId(userModel.getUserId())
                 .createUserName(userModel.getRealName())