合并分支 'dxy' 到 'master'

src/main/java/com/sfa/job/service/system/DeptAndUserServiceImpl.java

@@ -89,13 +89,12 @@ public class DeptAndUserServiceImpl implements IDeptAndUserService {
         //2、勤策人员离职 - 根据工号+勤策ID
         try {
             String empQcId = qinceEmployeeDao.getQcIdByEmpCode(employeeNo);
-            if (StringUtils.isEmpty(empQcId)){
-                return;
+            if (!StringUtils.isEmpty(empQcId)){
+                Map<String, Object> map = qinCeUtils.disabledUserParams(employeeNo,empQcId);
+                String url = qinCeUtils.builderUrl(QinCeUtils.MODIFY_USER, map);
+                qinCeUtils.postQC(url, map);
+                qinceEmployeeDao.userResigned(empQcId);
             }
-            Map<String, Object> map = qinCeUtils.disabledUserParams(employeeNo,empQcId);
-            String url = qinCeUtils.builderUrl(QinCeUtils.MODIFY_USER, map);
-            qinCeUtils.postQC(url, map);
-            qinceEmployeeDao.userResigned(empQcId);
         }catch (Exception e){
             log.error("勤策接口禁用用户异常，详情：{}",e.getMessage());
         }

src/main/resources/mapper/master/SysUserMapper.xml

@@ -106,8 +106,8 @@
         update sys_user set offboard_date = #{offboardDate} where user_name = #{employeeNo}
     </update>
 
-    <select id="selectResignedUsers" resultType="java.util.List">
-        select user_name from sys_user where del_flag = '0' and offboard_date &lt;= current_date();
+    <select id="selectResignedUsers" resultType="java.lang.String">
+        select user_name from sys_user where offboard_date &lt;= current_date();
     </select>
 
     <update id="putById" parameterType="com.sfa.job.domain.system.entity.SysUser">