修改bug

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/framework/BusinessIdentifyAspect.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.framework;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -47,8 +48,10 @@ public class BusinessIdentifyAspect {
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             ReginParams.BusinessInfo businessInfo = new ReginParams.BusinessInfo();
             //company
-            Long amosBizCode = reginParams.getCompany().getSequenceNbr();
-            OrgUsr companyOrgUsr = orgUsrService.getById(amosBizCode);
+            Long amosOrgId= reginParams.getCompany().getSequenceNbr();
+            LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(OrgUsr :: getAmosOrgId,amosOrgId);
+            OrgUsr companyOrgUsr = orgUsrService.getOne(wrapper);
             String companyName = companyOrgUsr.getBizOrgName();
             Long companySequenceNbr = companyOrgUsr.getSequenceNbr();
             String companyType = companyOrgUsr.getOrgExpandAttr1();
@@ -56,13 +59,15 @@ public class BusinessIdentifyAspect {
                 companyType = companyOrgUsr.getBizOrgType();
             }
             businessInfo.setCompanyName(companyName);
-            businessInfo.setAmosBizCode(amosBizCode);
+            businessInfo.setAmosBizCode(amosOrgId);
             businessInfo.setCompanyType(companyType);
             businessInfo.setCompanySequenceNbr(companySequenceNbr);
 
             //User
-            Long amosUserCode = reginParams.getUserModel().getSequenceNbr();
-            OrgUsr userOrgUsr = orgUsrService.getById(amosUserCode);
+            amosOrgId = reginParams.getUserModel().getSequenceNbr();
+            wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(OrgUsr::getAmosOrgId,amosOrgId);
+            OrgUsr userOrgUsr = orgUsrService.getOne(wrapper);
             String userName = userOrgUsr.getBizOrgName();
             Long userSequenceNbr = userOrgUsr.getSequenceNbr();
             String userType = userOrgUsr.getOrgExpandAttr1();
@@ -72,7 +77,7 @@ public class BusinessIdentifyAspect {
             businessInfo.setUserSequenceNbr(userSequenceNbr);
             businessInfo.setUserName(userName);
             businessInfo.setUserType(userType);
-            businessInfo.setAmosUserCode(amosUserCode);
+            businessInfo.setAmosUserCode(amosOrgId);
             reginParams.setBusinessInfo(businessInfo);
         }
     }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -134,9 +134,11 @@ public class OrgServiceImpl {
         }
         if (OrgEnum.普通人员.getKey().equals(bizOrgType)){
             if(!ValidationUtil.isEmpty(jsonObject.getInteger("isWelder"))){
-                if (1==jsonObject.getInteger("isWelder")) {
-                    orgUsr.setOrgExpandAttr1(OrgEnum.焊工.getKey());
-                    orgUsr.setCode(getCode());
+                if(ValidationUtil.isEmpty(sequenceNbr)){
+                    if (1==jsonObject.getInteger("isWelder")) {
+                        orgUsr.setOrgExpandAttr1(OrgEnum.焊工.getKey());
+                        orgUsr.setCode(getCode());
+                    }
                 }
             }
             LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
@@ -256,8 +258,7 @@ public class OrgServiceImpl {
      */
     public IPage getCompanyWelder(IPage page){
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()))
-                .eq(OrgUsr::getBizOrgType,OrgEnum.焊工.getKey());
+        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
         return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
     }
 
@@ -267,8 +268,7 @@ public class OrgServiceImpl {
      */
     public IPage getCompanyDept(IPage page){
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()))
-                .eq(OrgUsr::getBizOrgType,OrgEnum.部门.getKey());
+        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
         return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
     }