修改新增企业员工

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
@@ -129,6 +130,7 @@ public class OrgServiceImpl {
         orgUsr.setRecDate(new Date());
         orgUsr.setBizOrgName(jsonObject.getString("name"));
         orgUsr.setSequenceNbr(jsonObject.getLong("sequenceNbr"));
+        //设置人员类型
         orgUsr.setBizOrgType(bizOrgType);
         orgUsr.setAmosOrgId(jsonObject.getString("amosOrgId"));
         orgUsr.setAmosOrgCode(jsonObject.getString("amosOrgCode"));
@@ -137,6 +139,7 @@ public class OrgServiceImpl {
             orgUsr.setOrgExpandAttr1(jsonObject.getString("type"));
             orgUsr.setBizOrgCode(jsonObject.getString("creditCode"));
         }
+
         if (OrgEnum.普通人员.getKey().equals(bizOrgType)){
             if(!ValidationUtil.isEmpty(jsonObject.getInteger("isWelder"))){
                 if(ValidationUtil.isEmpty(sequenceNbr)){
@@ -147,13 +150,20 @@ public class OrgServiceImpl {
                 }
             }
             LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+            //判断筛选条件
             if (!ValidationUtil.isEmpty(jsonObject.getLong("isCheck"))) {
                 wrapper.eq(OrgUsr :: getAmosOrgId,jsonObject.getLong("isCheck"));
             } else {
-                wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
+                //设置所属机构
+                //判断是否存在监检机构id
+                if(!jsonObject.getString("dept").isEmpty()){
+                    wrapper.eq(BaseEntity::getSequenceNbr,jsonObject.getString("dept"));
+                    orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
+                }else {
+                    wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
+                    orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
+                }
             }
-
-            orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
         }
         if (OrgEnum.部门.getKey().equals(bizOrgType)) {
             LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
@@ -319,6 +329,16 @@ public class OrgServiceImpl {
     }
 
     /**
+     * 获取当前机构下的人员列表
+     */
+
+    @BusinessIdentify
+    public List<OrgUsr> getPreson(){
+
+
+        return null;
+    }
+    /**
      * 获取当前登陆人所在单位id（orgUsr表中的id）
      * @return
      */