组织逻辑删除后查询修改

bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalServiceImpl.java

@@ -836,9 +836,9 @@ public class AttCalServiceImpl implements AttCalService {
      */
     private void threadLeaveData(LeaveBean c) {
         //1.将请假区间变成日期集合
-        if(c.getUserId() == 1){
+//        if(c.getUserId() == 1){
-            System.out.println("米娜");
+//            System.out.println("米娜");
-        }
+//        }
         List<String> dateLists = AttTimeUtil.getStrDateListBetween(c.getLeaveStartDate(), c.getLeaveEndDate());
         if (!dateLists.isEmpty()) {
 //            //根据开始时间、结束时间获取节假日的日期集合

bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java

@@ -426,7 +426,7 @@ public class ExportFileController {
             writer.merge(rowNum + listData.size(), rowNum + listData.size() + 1, 0, 0,
                     "说明", false);
             writer.merge(rowNum + listData.size(), rowNum + listData.size(), 1, 2 + days.size(),
-                    "1.考勤记录：出勤记“√”，出差记“Δ”，年休假记“年”，探亲假记“探”，事假记“事”，法定假记“法”，病假记“病”，产假记“产”，婚假记“婚”，丧假记“丧”，育儿假记“育”，陪护假记“陪”，补休记“补”，旷工记“旷”，迟到记“迟”，早退记“退”，流产假记“流”，哺乳假记“哺”，节育假记“节”，父母护理假记“护”，其他记“其他”，省内工地记“工”，省外工地记“外”,未在考勤组记“/”,出差需在备注栏备注清楚出差地点。", false);
+                    "1.考勤记录：出勤记“√”，出差记“Δ”，年休假记“年”，探亲假记“探”，事假记“事”，法定假记“法”，病假记“病”，产假记“产”，婚假记“婚”，丧假记“丧”，育儿假记“育”，陪护假记“陪”，补休记“补”，旷工记“旷”，迟到记“迟”，早退记“退”，流产假记“流”，哺乳假记“哺”，节育假记“节”，父母护理假记“护”，其他记“其他”，省内工地记“工”，省外工地记“外”,培训记“培”,未在考勤组记“/”,出差需在备注栏备注清楚出差地点。", false);
             writer.merge(rowNum + listData.size() + 1, rowNum + listData.size() + 1, 1, 2 + days.size(),
                     "2.员工有关请假凭证，记录清楚准确，与本表于次月3日前一并报人力资源管理部门（专业分公司报送时间为30日前）。", false);
             writer.autoSizeColumn(3);

bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java

@@ -45,12 +45,6 @@ public class HolidayController extends BaseController {
     @Resource(name = "HolidayService")
     private HolidayService holidayService;
 
-    @Resource(name = "WorkReportDao")
-    private WorkReportDao dao;
-
-    @Resource
-    private SysUserMapper userMapper;
-
     @Resource(name = "ProDeptRoleDao")
     private ProDeptRoleDao proDeptRoleDao;
 

bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml

@@ -181,7 +181,7 @@
         UNION ALL
         SELECT su.user_id as userId , su.user_name as userName
         FROM sys_user su
-        LEFT JOIN sys_user_org suo ON su.user_id = suo.user_id and su.user_id !=#{params.id}
+        LEFT JOIN sys_user_org suo ON su.user_id = suo.user_id And suo.is_active= '1' and su.user_id !=#{params.id}
         WHERE 1=1
         <if test='params.orgList != null and params.orgList.size() > 0'>
             and suo.org_id in (

bonus-modules/bonus-system/src/main/resources/mapper/att/AttGroupMapper.xml

@@ -106,7 +106,7 @@
                0 AS attStatus,
                1 AS attType
         FROM sys_user_org suo
-        WHERE user_id IN
+        WHERE suo.is_active = '1' and user_id IN
         <foreach item="item" collection="list" separator="," open="(" close=")" index="">
             #{item.userId}
         </foreach>
@@ -117,7 +117,7 @@
                0 AS attStatus,
                2 AS attType
         FROM sys_user_org suo
-        WHERE user_id IN
+        WHERE suo.is_active = '1' and user_id IN
         <foreach item="item" collection="list" separator="," open="(" close=")" index="">
             #{item.userId}
         </foreach>

bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml

@@ -284,7 +284,7 @@
                IFNULL(sum(IF(offWorkAttStatus = 26, 0.5, 0)), 0)                                                      AS outsideAttNum
         FROM v_att_update_data v
                  LEFT JOIN sys_user su ON su.user_id = v.user_id
-                 LEFT JOIN sys_user_org suo ON suo.user_id = v.user_id
+                 LEFT JOIN sys_user_org suo ON suo.user_id = v.user_id and suo.is_active = '1'
                  LEFT JOIN sys_organization so ON so.id = suo.org_id
         WHERE DATE_FORMAT(att_current_day, '%Y-%m') = DATE_FORMAT(#{pushDate}, '%Y-%m')
         GROUP BY DATE_FORMAT(att_current_day, '%Y-%m'),
@@ -409,7 +409,7 @@
                '0'         AS attStatus
         FROM att_setting_history ash
                  LEFT JOIN sys_user su ON ash.user_id = su.user_id
-                 left join sys_user_org suo ON su.user_id = suo.user_id
+                 left join sys_user_org suo ON su.user_id = suo.user_id And suo.is_active= '1'
         WHERE ash.current_day = #{pushDate}
           and suo.org_id is not null
         UNION
@@ -421,7 +421,7 @@
                '0'         AS attStatus
         FROM att_setting_history ash
                  LEFT JOIN sys_user su ON ash.user_id = su.user_id
-                 left join sys_user_org suo ON su.user_id = suo.user_id
+                 left join sys_user_org suo ON su.user_id = suo.user_id and suo.is_active = '1'
         WHERE ash.current_day = #{pushDate}
           and suo.org_id is not null
     </select>
@@ -476,7 +476,7 @@
                DATE_FORMAT(#{pushDate}, '%Y-%m') as attCurrentMonth
         FROM att_setting_history ash
                  LEFT JOIN sys_user su ON su.user_id = ash.user_id
-                 LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id
+                 LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id And suo.is_active= '1'
                  LEFT JOIN sys_organization so ON so.id = suo.org_id
         WHERE DATE_FORMAT(ash.current_day, '%Y-%m') = DATE_FORMAT(#{pushDate}, '%Y-%m')
           and suo.org_id is not null
@@ -513,7 +513,7 @@
                suo.org_id,
                so.org_name
         FROM sys_user su
-                 LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id
+                 LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id And suo.is_active= '1'
                  LEFT JOIN sys_organization so ON so.id = suo.org_id
         where su.user_id = #{userId}
     </select>

bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml

@@ -432,7 +432,7 @@
         (select * FROM att_setting_history WHERE current_day = #{attCurrentDay}) ash
         LEFT JOIN sys_user su ON  ash.user_id = su.user_id
         LEFT JOIN ( SELECT * FROM v_att_update_data WHERE att_current_day = #{attCurrentDay} ) v on su.user_id = v.user_id
-        LEFT JOIN sys_user_org org ON org.user_id = su.user_id
+        LEFT JOIN sys_user_org org ON org.user_id = su.user_id And suo.is_active= '1'
         LEFT JOIN sys_organization so ON so.id = org.org_id
         <where>
             <if test="attendType == 1 || attendType == '1'">
@@ -445,7 +445,7 @@
                 SELECT su.user_id FROM sys_user su
                 LEFT JOIN v_att_update_data a ON a.user_id = su.user_id
                 LEFT JOIN att_group_person_relation agpr ON agpr.user_id = su.user_id
-                LEFT JOIN sys_user_org org ON org.user_id = su.user_id
+                LEFT JOIN sys_user_org org ON org.user_id = su.user_id And suo.is_active= '1'
                 left join sys_organization so on so.id = org.org_id
                 WHERE su.is_active = 1 AND agpr.is_active = 1
                 AND att_current_day = #{attCurrentDay}

bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml

@@ -168,6 +168,7 @@
                 AND so.is_active = '1'
         WHERE
             suo.user_id = #{userId}
+            and suo.is_active = '1'
             LIMIT 1
     </select>
     <select id="getWebLeaveList" resultType="com.bonus.system.evection.entity.EvectionBean">

bonus-modules/bonus-system/src/main/resources/mapper/basic/SysNoticeMapper.xml

@@ -61,7 +61,7 @@
         sys_notice_user snu
         LEFT JOIN sys_notice sn on sn.id=snu.notice_id and sn.is_active=1
         LEFT JOIN sys_user su on su.user_id=sn.user_id and su.is_active=1
-        LEFT JOIN sys_user_org suo on suo.user_id=sn.user_id and suo.is_active=1
+        LEFT JOIN sys_user_org suo on suo.user_id=sn.user_id and suo.is_active = 1
         LEFT JOIN sys_dict_data sdd on sdd.dict_code=sn.type and sdd.`status`=0
         WHERE snu.is_active=1
         <if test="bean.roleType =='3' || bean.roleType == 3 ">

bonus-modules/bonus-system/src/main/resources/mapper/basic/SysOrgDao.xml

@@ -92,7 +92,7 @@
                         user_name  as userName,
                         suo.org_id as orgId
         from sys_user su
-                 left join sys_user_org suo on suo.user_id = su.user_id
+                 left join sys_user_org suo on suo.user_id = su.user_id And suo.is_active= '1'
         where user_name = #{name}
         GROUP BY su.user_id
         ORDER BY suo.create_time
@@ -151,7 +151,7 @@
         select * from (SELECT o.*, GROUP_CONCAT(u.user_id) as orgHeadUserId, GROUP_CONCAT(u.user_name) as orgHeadUserName,
         a.user_id as attendanceUserId, a.user_name as attendanceUserName FROM (
         SELECT o.*  FROM sys_user u
-        LEFT JOIN sys_user_org uo ON u.user_id = uo.user_id
+        LEFT JOIN sys_user_org uo ON u.user_id = uo.user_id and suo.is_active = '1'
         LEFT JOIN sys_organization o ON o.id =uo.org_id
         WHERE u.user_id = #{bean.userId}
         ) o
@@ -178,7 +178,7 @@
             su.phone as phoneNumber,
             suo.org_id,
             so.org_name as afterOrgName,
-            suo.update_time as changeTime,
+            suo.create_time as changeTime,
             GROUP_CONCAT( DISTINCT sdd.dict_label ) as postName,
             GROUP_CONCAT( DISTINCT sr.role_name ) as roleName
         FROM
@@ -193,7 +193,8 @@
                 LEFT JOIN sys_role sr ON sr.role_id = sur.role_id
                 AND sr.del_flag = 0
         WHERE
-            suo.user_id IN ( SELECT user_id FROM sys_user_org GROUP BY user_id HAVING COUNT(*) > 1 )
+            suo.user_id IN ( SELECT user_id FROM sys_user_org where is_active = '1' GROUP BY user_id HAVING COUNT(*) > 1 )
+            and suo.is_active= '1'
             <if test="userName != null and userName != ''">
                 AND locate(#{userName}, su.user_name)
             </if>
@@ -203,7 +204,7 @@
         GROUP BY
             suo.user_id,
             suo.org_id,
-            suo.update_time
+            suo.create_time
     </select>
 
     <insert id="insertOrg" useGeneratedKeys="true" keyColumn="id" keyProperty="id">

bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml

@@ -140,7 +140,7 @@
         FROM sys_organization
         WHERE id IN (SELECT org_id
                      FROM sys_user_org
-                     WHERE user_id = #{userId})
+                     WHERE user_id = #{userId} and is_active = '1')
     </select>
     <select id="selectUserList" resultType="com.bonus.system.api.domain.SysUser">
         SELECT

bonus-modules/bonus-system/src/main/resources/mapper/dept/ProDeptRoleMapper.xml

@@ -167,6 +167,7 @@
             AND org_id = #{orgId}
         </if>
         ) mm ON mm.user_id = su.user_id
+        where suo.is_active = '1'
     </select>
 
     <select id="getRoleUserById" resultType="java.lang.String">

bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml

@@ -233,7 +233,7 @@
         UNION ALL
         SELECT su.user_id as userId, su.user_name as userName
         FROM sys_user su
-                 LEFT JOIN sys_user_org suo ON su.user_id = suo.user_id AND su.user_id != #{params.id}
+        LEFT JOIN sys_user_org suo ON su.user_id = suo.user_id And suo.is_active= '1' AND su.user_id != #{params.id}
         WHERE 1=1
         <if test='params.orgList != null and params.orgList.size() > 0'>
             and suo.org_id in (

bonus-modules/bonus-system/src/main/resources/mapper/holiday/WorkReportMapper.xml

@@ -272,7 +272,7 @@
         FROM
             sys_user_org
         WHERE
-            user_id = #{userId}
+            user_id = #{userId} and is_active = '1'
     </select>
     <select id="selectOrgIdByRoleAndUserId" resultType="java.lang.Long">
         SELECT so.id AS orgId

bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatMapper.xml

@@ -22,7 +22,7 @@
         ad.att_type
         FROM att_data_update ad
         LEFT JOIN sys_user su ON ad.user_id = su.user_id
-        LEFT JOIN sys_user_org suo on su.user_id =  suo.user_id
+        LEFT JOIN sys_user_org suo on su.user_id =  suo.user_id And suo.is_active= '1'
         LEFT JOIN (SELECT * FROM sys_dict_data WHERE dict_type = 'att_status') sd
         ON ad.att_status = sd.dict_value
         WHERE ad.is_active = '1'
@@ -79,7 +79,7 @@
         FROM
         v_att_update_data ad
         LEFT JOIN sys_user su ON ad.user_id = su.user_id
-        LEFT JOIN sys_user_org suo ON su.user_id = suo.user_id
+        LEFT JOIN sys_user_org suo ON su.user_id = suo.user_id And suo.is_active= '1'
         LEFT JOIN ( SELECT * FROM sys_dict_data WHERE dict_type = 'att_status' ) sd1 ON ad.toWorkAttStatus = sd1.dict_value
         LEFT JOIN ( SELECT * FROM sys_dict_data WHERE dict_type = 'att_status' ) sd2 ON ad.offWorkAttStatus = sd2.dict_value
         WHERE ad.dataSource = '3'