修改机构管理bug

src/main/java/com/ccsens/carbasics/bean/vo/ManagementVo.java

@@ -49,6 +49,8 @@ public class ManagementVo {
         private Long did;
         @ApiModelProperty("部门名称")
         private String departmentName;
+        @ApiModelProperty("修改状态")
+        private boolean departmentIsShow;
         @ApiModelProperty("部门下的职位列表")
         List<PositionInfo> positionInfoList;
         @ApiModelProperty("下级部门列表")
@@ -61,6 +63,8 @@ public class ManagementVo {
         private Long pid;
         @ApiModelProperty("职位名称")
         private String pName;
+        @ApiModelProperty("修改状态")
+        private boolean isShow;
         @ApiModelProperty("职位关联的角色")
         List<RoleInfo> roleList;
         @ApiModelProperty("职位下的角色列表")

src/main/java/com/ccsens/carbasics/service/ManagementService.java

@@ -84,6 +84,11 @@ public class ManagementService implements IManagementService {
             ArrayList<ManagementVo.HospitalData> sonList = new ArrayList<>();
             for (Long did : sonIdList) {
                 ManagementVo.HospitalData sonDepartmentData = organizationDao.querySonDepartmentData(did);
+                if (CollectionUtil.isNotEmpty(sonDepartmentData.getPositionInfoList())) {
+                    for (ManagementVo.PositionInfo positionInfo : sonDepartmentData.getPositionInfoList()) {
+                        positionInfo.setShow(false);
+                    }
+                }
                 sonList.add(sonDepartmentData);
                 querySonDepartment(sonDepartmentData);
             }
@@ -266,6 +271,7 @@ public class ManagementService implements IManagementService {
         position.setId(param.getPositionId());
         position.setRoleName(param.getPositionName());
         position.setName(param.getPositionName());
+        positionDao.updateByPrimaryKeySelective(position);
     }
 
     @Override

src/main/resources/mapper_dao/OrganizationDao.xml

@@ -922,6 +922,7 @@
     <resultMap id="departmentData1" type="com.ccsens.carbasics.bean.vo.ManagementVo$HospitalData">
         <id property="did" column="did"/>
         <result property="departmentName" column="departmentName"/>
+        <result property="departmentIsShow" column="departmentIsShow"/>
         <collection property="positionInfoList" javaType="List" ofType="com.ccsens.carbasics.bean.vo.ManagementVo$PositionInfo">
             <id property="pid" column="pid"/>
             <result property="pName" column="pName"/>
@@ -941,6 +942,7 @@
             o.id,
             o.`name` AS hName,
             od.id AS did,
+            false AS departmentIsShow,
             od.`name` AS departmentName,
             op.id AS pid,
             op.role_name AS pName,
@@ -951,8 +953,9 @@
             m.contact AS phone
         FROM
             t_organization AS o
-        LEFT JOIN t_organization_department AS od ON o.id = od.organization_id
-        LEFT JOIN t_organization_position AS op ON od.id = op.department_id
+        LEFT JOIN t_organization_department AS od ON o.id = od.organization_id AND od.rec_status = 0
+        LEFT JOIN t_organization_department_parent AS dp ON od.id = dp.department_id
+        LEFT JOIN t_organization_position AS op ON od.id = op.department_id  AND op.rec_status = 0
         LEFT JOIN t_organization_position_type_relation AS ptr ON ptr.position_id = op.id
         AND ptr.rec_status = 0
         LEFT JOIN t_organization_position_type AS pt ON ptr.position_type_id = pt.id
@@ -964,8 +967,8 @@
         WHERE
             o.rec_status = 0
         AND o.id = #{param.id}
-        AND od.rec_status = 0
-        AND op.rec_status = 0
+        AND dp.rec_status IS NULL
+
     </select>
 
     <select id="querySonDepartmentData" resultMap="departmentData1">