修改变更

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

@@ -131,7 +131,7 @@ public class OrgServiceImpl {
             orgUsr.setOrgExpandAttr1(jsonObject.getString("type"));
             orgUsr.setBizOrgCode(jsonObject.getString("creditCode"));
         }
-        if (OrgEnum.人员.getKey().equals(bizOrgType)){
+        if (OrgEnum.普通人员.getKey().equals(bizOrgType)){
             if (1==jsonObject.getInteger("isWelder")) {
                 orgUsr.setOrgExpandAttr1(OrgEnum.焊工.getKey());
                 orgUsr.setCode(getCode());
@@ -260,7 +260,7 @@ public class OrgServiceImpl {
         wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
         LambdaQueryWrapper<OrgUsr> personWrapper = new LambdaQueryWrapper<>();
         personWrapper.eq(OrgUsr::getParentId,orgUsrServiceImpl.getOne(wrapper).getSequenceNbr())
-                .eq(OrgUsr :: getBizOrgType,OrgEnum.人员.getKey());
+                .eq(OrgUsr :: getBizOrgType,OrgEnum.普通人员.getKey());
         return orgUsrServiceImpl.list(personWrapper);
     }
 
@@ -306,7 +306,7 @@ public class OrgServiceImpl {
         OrgUsr orgUsr = getOrgUsrById(sequenceNbr);
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(OrgUsr :: getBizOrgCode,orgUsr.getBizOrgCode())
-                .eq(OrgUsr::getBizOrgType,OrgEnum.人员.getKey())
+                .eq(OrgUsr::getBizOrgType,OrgEnum.普通人员.getKey())
                 .ne(OrgUsr::getOrgExpandAttr1,OrgEnum.焊工.getKey());
         List<OrgUsr> orgUsrList = orgUsrServiceImpl.list(wrapper);
         return orgUsrList;
@@ -320,7 +320,7 @@ public class OrgServiceImpl {
     public void delectInfo(String sequencenNbr) throws Exception {
         OrgUsr orgUsr = getOrgUsrById(sequencenNbr);
         LambdaQueryWrapper<DynamicFormInstance> dynamicWrapper = new LambdaQueryWrapper<>();
-        if(OrgEnum.人员.getKey().equals(orgUsr.getBizOrgType())){
+        if(OrgEnum.普通人员.getKey().equals(orgUsr.getBizOrgType())){
             dynamicWrapper.eq(DynamicFormInstance::getInstanceId,sequencenNbr);
             alertFormValueServiceImpl.remove(dynamicWrapper);
         }else{