Merge remote-tracking branch 'origin/chenhao' into chenhao

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -350,7 +350,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         pageBean.setTotal(this.baseMapper.selectPersonListCount(map));
         map.put("pageNum", (pageBean.getCurrent() - 1) * pageBean.getSize());
         map.put("pageSize", pageBean.getSize());
-
         List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
 
         /*Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 结束*/
@@ -622,13 +621,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgUsrVo, orgUsr);
-        /*部门编辑后 code值也应做出修改 2021-09-09 陈召 开始 */
+        /*单位编辑后 code值也应做出修改 2021-09-09 陈召 开始 */
         OrgUsr parent = getById(OrgUsrVo.getParentId());
         if (parent != null){
             orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
         }
         orgUsr.setSequenceNbr(id);
-        /*部门编辑后 code值也应做出修改 2021-09-09 陈召 结束  */
+        /*单位编辑后 code值也应做出修改 2021-09-09 陈召 结束  */
         saveOrgUsr(orgUsr, oriOrgUsr);
         // 保存动态表单数据
         updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgUsrVo.getDynamicFormValue());
@@ -784,6 +783,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
+        /*部门编辑后 code值也应做出修改 2021-09-09 陈召 开始 */
+        OrgUsr parent = getById(OrgDepartmentVo.getParentId());
+        if (parent != null){
+            orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
+        }
+        orgUsr.setSequenceNbr(id);
+        /*部门编辑后 code值也应做出修改 2021-09-09 陈召 结束  */
+
         saveOrgUsr(orgUsr, oriOrgUsr);
         // 保存动态表单数据
         updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgDepartmentVo.getDynamicFormValue());
@@ -969,7 +976,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             return null;
         }
         return ids.stream().map(m -> {
-            OrgUsr org = getById(m);
+            // BUG 2740 机场单位主键varchar 导致 通过主键搜索返回多条数据  2021 - 09 - 09by kongfm
+            OrgUsr org = getById(m.toString());
             if (ObjectUtils.isEmpty(org)) {
                 return null;
             }
@@ -983,8 +991,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     // BUG 2736 人员导出过滤已经删除的数据by kongfm
-    public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType, Boolean isDelete) {
-        return this.queryForList(null, false, parentId, bizOrgType, isDelete);
+    public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType) {
+        return Bean.toModels(this.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getParentId,parentId).eq(OrgUsr::getBizOrgType,bizOrgType)), this.getModelClass());
     }
 
     public OrgUsrDto getOrg(String amosUserId) {
@@ -1378,6 +1386,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
        }
        return list;
    }
+
 }