其他占用许可总数sql修改

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

@@ -166,7 +166,7 @@ public interface StaffMapper {
     /**
      * 查询其他占用许可总数
      */
-    Integer getOccupyNum();
+    Integer getOccupyNum(@Param("wxEnterpriseId") String wxEnterpriseId);
 
     TabHaobanStaff getStaffInfoByWxOpenUserId(@Param("wxOpenUseId") String wxOpenUseId);
     /**

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

@@ -156,7 +156,7 @@ public interface StaffService {
     /**
      * 查询其他占用许可总数
      */
-    Integer getOccupyNum();
+    Integer getOccupyNum(String wxEnterpriseId);
 
 
 

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

@@ -220,8 +220,8 @@ public class StaffServiceImpl implements StaffService {
     }
 
     @Override
-    public Integer getOccupyNum() {
-        return mapper.getOccupyNum();
+    public Integer getOccupyNum(String wxEnterpriseId) {
+        return mapper.getOccupyNum(wxEnterpriseId);
     }
 
     private void listAccount(TabHaobanWxEnterprise wxEnterprise , int limit , String cursor) {

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

@@ -111,7 +111,7 @@ public class WxEnterpriseActiveDataServiceImpl implements WxEnterpriseActiveData
         StaffActiveDataDTO staffActiveDataDTO = EntityUtil.changeEntityByJSON(StaffActiveDataDTO.class, tabHaobanWxEnterpriseActiveDataMapper.getWxEnterpriseActiveDataByWxEnterpriseId(wxEnterpriseId));
         //查询其他占用许可总数
         Integer occupy=0;
-        occupy=staffService.getOccupyNum();
+        occupy=staffService.getOccupyNum(wxEnterpriseId);
         staffActiveDataDTO.setOccupy(occupy);
         return staffActiveDataDTO;
     }

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

@@ -604,7 +604,7 @@
     </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
+        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>
 
     <select id="getStaffInfoByWxOpenUserId" resultMap="BaseResultMap">