姜永辉 2 лет назад
Родитель
Сommit
6a97655974

+ 0 - 10
src/main/java/com/dk/mdm/mapper/core/StaffMapper.xml

@@ -85,19 +85,9 @@
         SELECT
         <include refid="Base_Column_List"/>
         , org.org_name,org.level_name AS org_level_name
-
-        (SELECT array_agg(user_id)
-        FROM core.t_work_team
-        WHERE t.staff_id =any(staff_ids)) as "userIds"
         FROM dkic_b.t_mst_staff t
-        LEFT JOIN core.t_job job
-        ON t.job_Id = job.job_Id
-        LEFT JOIN core.t_post post
-        ON t.post_Id = post.post_Id
         LEFT JOIN dkic_b.t_mst_org org
         ON t.org_Id = org.org_Id
-        LEFT JOIN sys.t_data_kind AS model
-        ON t.staff_status = model.kind_code
         <include refid="Condition"/>
         ORDER BY t.flg_valid DESC,t.staff_code
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

+ 7 - 7
src/main/java/com/dk/mdm/service/core/StaffService.java

@@ -123,13 +123,13 @@ public class StaffService extends BaseService<Staff> {
 		}
 		for (Integer staffId : staffIds) {
 			staffVO.setStaffId(staffId);
-			// 获取员工状态
-			String staffStatus = staffMapper.selectStaffStatus(staffVO);
-			// 员工状态是否可以离职
-			if (Constant.StringConstant.STAFF_STATUS_IN_OFFICE.getName().equals(staffStatus)) {
-				// 更新员工状态
-				staffMapper.updateStaffStatus(staffVO);
-			}
+//			// 获取员工状态
+//			String staffStatus = staffMapper.selectStaffStatus(staffVO);
+//			// 员工状态是否可以离职
+//			if (Constant.StringConstant.STAFF_STATUS_IN_OFFICE.getName().equals(staffStatus)) {
+//				// 更新员工状态
+//				staffMapper.updateStaffStatus(staffVO);
+//			}
 		}
 
 		//批量编辑用户