fix

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

@@ -115,4 +115,10 @@ public interface DepartmentApiService {
 
 
 	void initwxDepartment(String corpid, String suiteid, String wxEnterpriseId);
+	/**
+	 * 回收站的数量
+	 * @param wxEnterpriseId
+	 * @return
+	 */
+	Integer departmentRecycleCount(String wxEnterpriseId);
 }

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

@@ -45,4 +45,6 @@ public interface DepartmentMapper {
 	Page<TabHaobanDepartment> pageByParentId(@Param("parentId")String parentId, @Param("keyword")String keyword);
 
 	List<TabHaobanDepartment> listByChainId(@Param("chainId")String chainId, @Param("wxEnterpriseId")String wxEnterpriseId);
+
+	Integer departmentRecycleCount(@Param("wxEnterpriseId")String wxEnterpriseId);
 }
\ No newline at end of file

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

@@ -36,4 +36,6 @@ public interface DepartmentService {
 
 	List<TabHaobanDepartment> listByChainId(String chainId, String wxEnterpriseId);
 
+	Integer departmentRecycleCount(String wxEnterpriseId);
+
 }

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

@@ -136,4 +136,9 @@ public class DepartmentServiceImpl implements DepartmentService {
 		return mapper.listByChainId(chainId,wxEnterpriseId);
 	}
 
+	@Override
+	public Integer departmentRecycleCount(String wxEnterpriseId) {
+		return mapper.departmentRecycleCount(wxEnterpriseId);
+	}
+
 }

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

@@ -360,4 +360,9 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 			}
 		}
 	}
+
+	@Override
+	public Integer departmentRecycleCount(String wxEnterpriseId) {
+		return departmentService.departmentRecycleCount(wxEnterpriseId);
+	}
 }

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

@@ -341,4 +341,13 @@
     and status_flag = 1
   </select>
   
+  <select id="departmentRecycleCount" resultType="java.lang.Integer" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_department
+    where wx_enterprise_id = #{wxEnterpriseId}
+    and status_flag = 1
+    and recycle_flag = 1
+  </select>
+  
 </mapper>
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java

@@ -148,6 +148,16 @@ public class DepartmentContoller extends WebBaseController{
 		
 	}
 	
+	@RequestMapping("department-recycle-count")
+	public HaobanResponse departmentRecycleCount() {
+		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		String wxEnterpriseId = login.getWxEnterpriseId();
+		Integer count = departmentApiService.departmentRecycleCount(wxEnterpriseId);
+	
+		return resultResponse(HaoBanErrCode.ERR_1,count);
+		
+	}
+	
 	@RequestMapping("department-del")
 	public HaobanResponse departmentDel(String departmentId) {
 		DepartmentDTO dto = departmentApiService.selectById(departmentId);