1、修改组织机构查询

src/main/java/com/dk/mdm/mapper/mst/OrgMapper.xml

@@ -275,16 +275,17 @@
         SELECT
         <include refid="Base_Column_List_view"/>
         ,tmg.org_name as parent_name
+        ,parent.org_code 
         FROM dkic_b.t_mst_org AS parent
         left join dkic_b.t_mst_org tmg on tmg.org_id=parent.parent_id
-        WHERE parent.org_id = #{orgId}::uuid
+        WHERE parent.org_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_org的一行数据 -->
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_org
+        FROM dkic_b.t_mst_org
         WHERE org_id = #{orgId}
         for update
     </select>

src/main/java/com/dk/mdm/service/mst/OrgService.java

@@ -133,17 +133,15 @@ public class OrgService extends BaseService<Org> {
     public ResponseResultVO<?> insert(OrgVO orgVO) {
         // 转化实体
         Org organization = orgConvert.convertToPo(orgVO);
-        // 获取显示顺序
-        Integer displayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORG);
         Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.ORG.getName(), true);
         // 获取编码和主键UuId
-        organization.setDisplayNo(displayNo);
         organization.setOrgId(codeMap.get("outId").toString());
         organization.setOrgCode(codeMap.get("outNote").toString());
 
         //查询 本次要加的 部门的 父级下 最大的DisplayNo  然后加1  就是现在要加的DisplayNo
         Map<String, Object> param = new HashMap<>();
         param.put("otherCond", "parent_id = #{parentID} ::uuid");
+        param.put("parentId",organization.getParentId());
         organization.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORG ,param));
         if (organization.getParentId() != null) {
             Org org = orgMapper.selectById(organization.getParentId());
@@ -151,7 +149,6 @@ public class OrgService extends BaseService<Org> {
             organization.setTopId(org.getTopId());
         }
 
-
         // 插入组织部门数据
         super.insert(organization);
         //执行函数