Commit cd5f3cb4 by qwmqiuwenmin

fix

parent 28bc550e
......@@ -158,7 +158,7 @@ public class DepartmentContoller extends WebBaseController{
Map<String,Object> map = new HashMap<String, Object>();
map.put("count", count);
map.put("syncDate", RedisUtil.getCache("haoban-sync-department-" + wxEnterpriseId));
return resultResponse(HaoBanErrCode.ERR_1,count);
return resultResponse(HaoBanErrCode.ERR_1,map);
}
......@@ -315,7 +315,7 @@ public class DepartmentContoller extends WebBaseController{
@RequestMapping("department-recycle-list")
public HaobanResponse departmentRecycleList(String keyword,Integer storeFlag,BasePageInfo pageInfo) {
LoginVO login = (LoginVO) AuthRequestUtil.getAppLoginUser();
LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
String wxEnterpriseId = login.getWxEnterpriseId();
Integer recycleFlag = 1;
Page<DepartmentDTO> page = departmentApiService.pageDepartmentByParams(pageInfo,wxEnterpriseId,keyword,storeFlag,recycleFlag);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment