Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java

@@ -40,6 +40,8 @@ public interface StaffMapper {
 
     List<TabHaobanStaff> listByPhoneNumber(@Param("phoneNumber") String phoneNumber);
 
+    int delStaff(@Param("staffId") String staffId) ;
+    
     int cleanStaff(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
 
     List<String> listUserStaffId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java

@@ -115,10 +115,7 @@ public class StaffServiceImpl implements StaffService {
 
     @Override
     public int delByStaffId(String staffId) {
-        TabHaobanStaff staff = new TabHaobanStaff();
-        staff.setStaffId(staffId);
-        staff.setStatusFlag(0);
-        return this.mapper.updateByPrimaryKeySelective(staff);
+        return this.mapper.delStaff(staffId);
     }
 
     @Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -69,8 +69,6 @@ public class MessageApiServiceImpl implements MessageApiService {
     @Autowired
     private QywxDepartmentApiService qywxDepartmentApiService;
     @Autowired
-    private QQCloudPicService qqCloudPicService;
-    @Autowired
     private InnerApiService innerApiService;
     @Autowired
     private StaffClerkRelationApiService staffClerkRelationApiService;

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -318,7 +318,7 @@
         
          <!--  其他占用  -->
         <if test="occupy != null and 1==occupy">
-        	and a.status_flag = 0 and a.update_time >= DATE_FORMAT(NOW(),'%Y-%m-%d') and a.active_status = 1  
+        	and a.status_flag = 0 and a.del_time >= DATE_FORMAT(NOW(),'%Y-%m-%d') and a.active_status = 1  
         </if>
         <!--   -->
         <if test="occupy != null and 2==occupy">
@@ -415,7 +415,7 @@
         update tab_haoban_staff
         set
         status_flag = 0,
-        update_time = now()
+        update_time = now() , del_time = now()
         where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} and status_flag = 1
         and staff_id in
         <foreach collection="staffIds" item="item" open="(" separator="," close=")">
@@ -423,6 +423,13 @@
         </foreach>
     </update>
 
+	<update id="delStaff">
+        update tab_haoban_staff set
+        status_flag = 0,
+        update_time = now() , del_time = now()
+        where staff_id = #{staffId} and status_flag = 1
+    </update>
+
     <select id="listUserStaffId" resultType="string">
         select staff_id FROM tab_haoban_staff
         WHERE
@@ -601,10 +608,11 @@
     		<foreach collection="wxUserIdList" index="index" item="id" close=")" open="(" separator=",">
     			 #{id}
     		</foreach>
+    		and status_flag = 1
     </update>
 
     <select id="getOccupyNum" resultType="java.lang.Integer">
-        SELECT count(*) FROM tab_haoban_staff WHERE status_flag = 0 and update_time >= DATE_FORMAT(NOW(),'%Y-%m-%d') and active_status = 1 and wx_enterprise_id = #{wxEnterpriseId}
+        SELECT count(*) FROM tab_haoban_staff WHERE status_flag = 0 and del_time >= DATE_FORMAT(NOW(),'%Y-%m-%d') and active_status = 1 and wx_enterprise_id = #{wxEnterpriseId}
     </select>