Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/CompanyController.java

@@ -49,6 +49,12 @@ public class CompanyController {
 
     public static final HashMap<String, Long> syncLog = new HashMap();
 
+    @RequestMapping("/getStaffCountMax")
+    public HttpRespMsg getStaffCountMax(Integer companyId){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = companyService.getById(companyId).getStaffCountMax();
+        return msg;
+    }
 
     @RequestMapping("/dataMigration")
     public HttpRespMsg dataMigration(Integer oldCompanyId,Integer targetCompanyId){

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/LeaveSheetController.java

@@ -1,13 +1,13 @@
 package com.management.platform.controller;
 
 
-import com.management.platform.entity.ExpenseSheet;
-import com.management.platform.entity.LeaveSheet;
-import com.management.platform.entity.SysFunction;
-import com.management.platform.entity.User;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.*;
 import com.management.platform.entity.vo.SysRichFunction;
+import com.management.platform.mapper.DepartmentMapper;
 import com.management.platform.mapper.SysFunctionMapper;
 import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.DepartmentService;
 import com.management.platform.service.ExpenseSheetService;
 import com.management.platform.service.LeaveSheetService;
 import com.management.platform.util.HttpRespMsg;
@@ -18,7 +18,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -40,6 +42,10 @@ public class LeaveSheetController {
     private HttpServletRequest request;
     @Resource
     SysFunctionMapper sysFunctionMapper;
+    @Resource
+    DepartmentMapper departmentMapper;
+    @Resource
+    DepartmentService departmentService;
 
 
     /**
@@ -62,14 +68,6 @@ public class LeaveSheetController {
 
     @RequestMapping("/list")
     public HttpRespMsg list(LeaveSheet sheet, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部请假单");
-        if (functionList.size() == 0) {
-            //普通员工只能看自己的
-            sheet.setOwnerId(user.getId());
-        }
-        sheet.setCompanyId(user.getCompanyId());
         return leaveSheetService.queryList(sheet, pageIndex, pageSize);
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -1179,6 +1179,26 @@ public class WeiXinCorpController {
         return wxCorpInfoService.getUserCheckInDayData(companyId, userId, start, end, true);
     }
 
+    @RequestMapping("/getCurMonthDayData")
+    public HttpRespMsg getCurMonthDayData(int companyId) {
+        LocalDate now = LocalDate.now();
+        if (now.getDayOfMonth() == 1) {
+            //本月1号，直接返回
+            return new HttpRespMsg();
+        }
+
+        now = now.withDayOfMonth(1);
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String startDate = dtf.format(now);
+        now = LocalDate.now();
+        now = now.minusDays(1);
+        String endDate = dtf.format(now);
+        LocalDateTime start = LocalDateTime.parse(startDate+" 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        LocalDateTime end = LocalDateTime.parse(endDate+" 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        System.out.println(companyId+"  startDate="+startDate+", endDate="+endDate);
+        return wxCorpInfoService.getUserCheckInDayData(companyId, null, start, end, true);
+    }
+
 
     @RequestMapping("/getUserCheckInData")
     public HttpRespMsg getUserCheckInData(int companyId) {
@@ -1311,7 +1331,8 @@ public class WeiXinCorpController {
                     .setCompanyId(companyId)
                     .setName(userJson.getString("name"))
                     .setCorpwxUserid(curUserid)
-                    .setColor(ColorUtil.randomColor());
+                    .setColor(ColorUtil.randomColor())
+                    .setInductionDate(LocalDate.now());
 
             //检查用户是否已经存在
             if (userMapper.selectCount(new QueryWrapper<User>().eq("corpwx_userid", curUserid)) == 0) {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -1,23 +1,23 @@
 package com.management.platform.entity;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author Seyason
- * @since 2022-08-12
+ * @since 2022-08-17
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -338,6 +338,12 @@ public class TimeType extends Model<TimeType> {
     @TableField("finance_jobnum_enabled")
     private Integer financeJobnumEnabled;
 
+    /**
+     * 日报审核通过消息推送 0-未开启 1-开启
+     */
+    @TableField("report_approve_msgpush")
+    private Integer reportApproveMsgpush;
+
     @TableField(exist = false)
     private List<User> userList;
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/BusinessTripServiceImpl.java

@@ -68,7 +68,7 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
         List<List<String>> sheetOneDataList=new ArrayList<>();
         List<List<String>> sheetTwoDataList=new ArrayList<>();
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        String[] sheetOneTitleArray=new String[]{"出差人员","出差事由","出差详情","交通工具","出差天数","出差开始时间","出差结束时间","状态","备注"};
+        String[] sheetOneTitleArray=new String[]{"出差人员","出差天数","出差详情","交通工具","出差开始时间","出差结束时间","状态","备注"};
         String[] sheetTwoTitleArray=new String[]{"出差人员","总出差天数"};
         List<String> sheetOneTitleList=Arrays.asList(sheetOneTitleArray);
         List<String> sheetTwoTitleList=Arrays.asList(sheetTwoTitleArray);
@@ -78,7 +78,7 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
         for (BusinessTrip businessTrip : recordsList) {
             List<String> item=new ArrayList<>();
             item.add(businessTrip.getOwnerName());
-            item.add(businessTrip.getReason());
+            item.add(String.valueOf(businessTrip.getDayCount()));
             List<BustripProject> businessTripProjectList = businessTrip.getProjectList();
             String detail="";
             if(businessTripProjectList.size()>0){
@@ -89,7 +89,6 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
                     }else {
                         detail+=bustripProject.getStartDate()+"至"+bustripProject.getEndDate()+" "+(StringUtils.isEmpty(bustripProject.getProjectName())?"":bustripProject.getProjectName())+" "+(StringUtils.isEmpty(bustripProject.getDegreeName())?"":bustripProject.getDegreeName());
                     }
-
                 }
             }
             item.add(detail);
@@ -105,7 +104,6 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
                 case 4:item.add("其他");
                     break;
             }
-            item.add(String.valueOf(businessTrip.getDayCount()));
             item.add(df.format(businessTrip.getStartDate()));
             item.add(df.format(businessTrip.getEndDate()));
             switch (businessTrip.getStatus()){

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/LeaveSheetServiceImpl.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.management.platform.entity.*;
+import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
+import com.management.platform.service.DepartmentService;
 import com.management.platform.service.ExpenseItemService;
 import com.management.platform.service.LeavePmauditService;
 import com.management.platform.service.LeaveSheetService;
@@ -17,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -48,7 +51,12 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
     private LeavePmauditService leavePmauditService;
     @Resource
     private UserYearleaveSettingMapper userYearleaveSettingMapper;
-
+    @Resource
+    private HttpServletRequest request;
+    @Resource
+    SysFunctionMapper sysFunctionMapper;
+    @Resource
+    DepartmentService departmentService;
 
     @Override
     public HttpRespMsg add(LeaveSheet sheet, String userId) {
@@ -115,6 +123,36 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
     @Override
     public HttpRespMsg queryList(LeaveSheet sheet, Integer pageIndex, Integer pageSize) {
         QueryWrapper<LeaveSheet> queryWrapper = new QueryWrapper<LeaveSheet>();
+        String token = request.getHeader("TOKEN");
+        User user = userMapper.selectById(token);
+        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部请假单");
+        if (functionList.size() == 0) {
+            //部门主要负责人可以看这个部门的
+            List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
+            if (departmentList.size() > 0) {
+                //先是自己的
+                List<String> userIds = new ArrayList<>();
+                userIds.add(user.getId());
+                //负责的部门的人员
+                List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
+                List<Integer> allDeptIds = new ArrayList<>();
+                for (Department firstLevelDept : departmentList) {
+                    List<Integer> deptIncludeSubDeptIds = departmentService.getDeptIncludeSubDeptIds(firstLevelDept.getDepartmentId(), allDeptList);
+                    allDeptIds.addAll(deptIncludeSubDeptIds);
+                }
+                if (allDeptIds.size() > 0) {
+                    List<User> userList = userMapper.selectList(new QueryWrapper<User>().select("id").in("department_id", allDeptIds));
+                    List<String> collect = userList.stream().map(User::getId).collect(Collectors.toList());
+                    userIds.addAll(collect);
+                    queryWrapper.in("owner_id", userIds);
+                }
+            } else {
+                //普通员工只能看自己的
+                sheet.setOwnerId(user.getId());
+            }
+        }
+        sheet.setCompanyId(user.getCompanyId());
+
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         queryWrapper.eq("company_id", sheet.getCompanyId()).orderByDesc("id");
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -1399,37 +1399,45 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<CompanyDingding> companyDingdingList = companyDingdingService.list(new QueryWrapper<CompanyDingding>().eq("company_id", company.getId()));
             String pNames = projectList.stream().map(Project::getProjectName).collect(Collectors.joining(", ", "[", "]"));
             //审核通过操作 向被审核人推送消息
-            for (Report report : reportList) {
-                String uId = report.getCreatorId();
-                Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(uId)).findFirst();
-                if(first.isPresent()){
-                    User u = first.get();
-                    if(u.getCorpwxUserid()!=null){
-                        if(wxCorpInfoList.size()>0){
-                            JSONObject json=new JSONObject();
-                            JSONArray dataJson=new JSONArray();
-                            JSONObject item=new JSONObject();
-                            item.put("key","审核人");
-                            item.put("value",user.getName());
-                            if(timeType.getNeedEvaluate()==1){
-                                item.put("key","评价");
-                                item.put("value",report.getEvaluate());
-                                json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
-                            }else {
-                                json.put("template_id","tty9TkCAAANpvEtLrkPUGeOEd1-U7W2w");
+            if(timeType.getReportApproveMsgpush()==1){
+                for (Report report : reportList) {
+                    if(report.getState()==1){
+                        String uId = report.getCreatorId();
+                        Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(uId)).findFirst();
+                        if(first.isPresent()){
+                            User u = first.get();
+                            if(u.getCorpwxUserid()!=null){
+                                if(wxCorpInfoList.size()>0){
+                                    JSONObject json=new JSONObject();
+                                    JSONArray dataJson=new JSONArray();
+                                    JSONObject item=new JSONObject();
+                                    item.put("key","审核人");
+                                    item.put("value",user.getName());
+                                    dataJson.add(item);
+                                    if(timeType.getNeedEvaluate()==1){
+                                        JSONObject item1=new JSONObject();
+                                        item1.put("key","评价");
+                                        item1.put("value",StringUtils.isEmpty(report.getEvaluate())?"":report.getEvaluate());
+                                        dataJson.add(item1);
+                                        json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
+                                    }else {
+                                        json.put("template_id","tty9TkCAAANpvEtLrkPUGeOEd1-U7W2w");
+                                    }
+                                    JSONObject item2=new JSONObject();
+                                    item2.put("key","日期");
+                                    item2.put("value",report.getCreateDate());
+                                    dataJson.add(item2);
+                                    json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
+                                    json.put("content_item",dataJson);
+                                    wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
+                                }
+                            }
+                            if(u.getDingdingUserid()!=null){
+                                if(companyDingdingList.size()>0){
+                                    CompanyDingding companyDingding = companyDingdingList.get(0);
+                                    companyDingdingService.sendReportApproveMsg(company.getId(),companyDingding.getAgentId(),user.getName(),report.getEvaluate(),report.getCreateDate(),u.getDingdingUserid());
+                                }
                             }
-                            item.put("key","日期");
-                            item.put("value",report.getCreateDate());
-                            dataJson.add(item);
-                            json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
-                            json.put("content_item",dataJson);
-                            wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
-                        }
-                    }
-                    if(u.getDingdingUserid()!=null){
-                        if(companyDingdingList.size()>0){
-                            CompanyDingding companyDingding = companyDingdingList.get(0);
-                            companyDingdingService.sendReportApproveMsg(company.getId(),companyDingding.getAgentId(),user.getName(),report.getEvaluate(),report.getCreateDate(),u.getDingdingUserid());
                         }
                     }
                 }
@@ -1818,12 +1826,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
         //获取公司全部人员； 按照人员状态，如果是已经离职的，当前日期在离职日期以后的，不需要显示该人员
         QueryWrapper<User> queryWrapper = new QueryWrapper<User>().eq("company_id", companyId);
-        queryWrapper.and(wrapper->wrapper.eq("is_active", 1).eq("report_status",0).or(wrapper2->wrapper2.eq("is_active", 0).gt("inactive_date", date)));
+        queryWrapper.and(wrapper->wrapper.eq("is_active", 1).eq("report_status",0)
+                .or(wrapper2->wrapper2.eq("is_active", 0).gt("inactive_date", date)));
         List<User> userList = userMapper.selectList(queryWrapper);
         List<LeaveSheet> leaveSheetList = leaveSheetMapper.selectList(new QueryWrapper<LeaveSheet>().eq("company_id", companyId));
         LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         List<HashMap> userMapList = new ArrayList<>();
+        LocalDate curDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         for (User u : userList) {
+            //入职日期在当前日期之后的，不要显示
+            if (u.getInductionDate() != null && u.getInductionDate().isAfter(curDate)) {
+                System.out.println("========"+u.getName());
+                continue;
+            }
             HashMap<String, Object> user = new HashMap<String, Object>();
             user.put("id", u.getId());
             user.put("name", u.getName());
@@ -2169,34 +2184,46 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<CompanyDingding> companyDingdingList = companyDingdingService.list(new QueryWrapper<CompanyDingding>().eq("company_id", company.getId()));
             String s = org.apache.commons.lang3.StringUtils.join(stringList, ",");
             int channel = oldState == -1?0:1; //0-导入审核, 项目报告审核
-            //审核通过操作 向被审核人推送消息
-            for (Report report : allReports) {
-                String uId = report.getCreatorId();
-                Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(uId)).findFirst();
-                if(first.isPresent()){
-                    User u = first.get();
-                    if(u.getCorpwxUserid()!=null){
-                        if(wxCorpInfoList.size()>0){
-                            JSONObject json=new JSONObject();
-                            JSONArray dataJson=new JSONArray();
-                            JSONObject item=new JSONObject();
-                            item.put("key","审核人");
-                            item.put("value",user.getName());
-                            item.put("key","评价");
-                            item.put("value",report.getEvaluate());
-                            item.put("key","日期");
-                            item.put("value",report.getCreateDate());
-                            dataJson.add(item);
-                            json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
-                            json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
-                            json.put("content_item",dataJson);
-                            wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
-                        }
-                    }
-                    if(u.getDingdingUserid()!=null){
-                        if(companyDingdingList.size()>0){
-                            CompanyDingding companyDingding = companyDingdingList.get(0);
-                            companyDingdingService.sendReportApproveMsg(company.getId(),companyDingding.getAgentId(),user.getName(),report.getEvaluate(),report.getCreateDate(),u.getDingdingUserid());
+            if(timeType.getReportApproveMsgpush()==1){
+                //审核通过操作 向被审核人推送消息
+                for (Report report : allReports) {
+                    if(report.getState()==1){
+                        String uId = report.getCreatorId();
+                        Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(uId)).findFirst();
+                        if(first.isPresent()){
+                            User u = first.get();
+                            if(u.getCorpwxUserid()!=null){
+                                if(wxCorpInfoList.size()>0){
+                                    JSONObject json=new JSONObject();
+                                    JSONArray dataJson=new JSONArray();
+                                    JSONObject item=new JSONObject();
+                                    item.put("key","审核人");
+                                    item.put("value",user.getName());
+                                    dataJson.add(item);
+                                    if(timeType.getNeedEvaluate()==1){
+                                        JSONObject item1=new JSONObject();
+                                        item1.put("key","评价");
+                                        item1.put("value",StringUtils.isEmpty(report.getEvaluate())?"":report.getEvaluate());
+                                        dataJson.add(item1);
+                                        json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
+                                    }else {
+                                        json.put("template_id","tty9TkCAAANpvEtLrkPUGeOEd1-U7W2w");
+                                    }
+                                    JSONObject item2=new JSONObject();
+                                    item2.put("key","日期");
+                                    item2.put("value",report.getCreateDate());
+                                    dataJson.add(item2);
+                                    json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
+                                    json.put("content_item",dataJson);
+                                    wxCorpInfoService.sendWXCorpTemplateMsg(wxCorpInfoList.get(0),u.getCorpwxUserid(),json);
+                                }
+                            }
+                            if(u.getDingdingUserid()!=null){
+                                if(companyDingdingList.size()>0){
+                                    CompanyDingding companyDingding = companyDingdingList.get(0);
+                                    companyDingdingService.sendReportApproveMsg(company.getId(),companyDingding.getAgentId(),user.getName(),report.getEvaluate(),report.getCreateDate(),u.getDingdingUserid());
+                                }
+                            }
                         }
                     }
                 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -263,8 +263,8 @@ public class TimingTask {
             wxCorpInfoService.getUserCheckInDayData(companyId, null, start, end, false);
         }
     }
-    //每个月第一天推送token到每个公司
-    @Scheduled(cron = "0 30 7 1 * ?")
+    //每半个小时推送一次token到每个公司
+    @Scheduled(fixedRate = 1800 * 1000)
     public void  pushToken(){
         int passwordLength = 30;
         LocalDateTime localDateTime=LocalDateTime.now();
@@ -283,7 +283,7 @@ public class TimingTask {
                     continue;
                 }
                 thirdPartyInterface.setToken(token);
-                thirdPartyInterface.setExpireTime(localDateTime.plusMonths(1));
+                thirdPartyInterface.setExpireTime(localDateTime.plusDays(1));
             }
         }
         thirdPartyInterfaceService.updateBatchById(thirdPartyInterfaceList);

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -121,10 +121,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
             }
             //检测密码正确时
-            if (company.getId() != 7) {
-                httpRespMsg.setError("非内部账号无法登陆");
-                return httpRespMsg;
-            }
+//            if (company.getId() != 7) {
+//                httpRespMsg.setError("非内部账号无法登陆");
+//                return httpRespMsg;
+//            }
             UserVO userVO = new UserVO().setCompanyName(company.getCompanyName());
             userVO.setCompany(company);
             BeanUtils.copyProperties(userList.get(0), userVO);

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -1205,6 +1205,12 @@ a {
                 this.$refs.chooseMembTree2.filter(val);
             }
         },
+        updated () {
+            // console.log('执行upload生命周期')
+            this.$nextTick(()=>{
+                this.$refs.projectlistOfWudulist.doLayout();
+            })
+        },
         methods: {
             hoverCall(row) {
                 this.rowid=row.id
@@ -2917,9 +2923,9 @@ a {
                         this.showColumnWidth = this.showColumn(list)
                         this.list = list;
                         this.total = res.data.total;
-                        this.$nextTick(()=>{
-                            this.$refs.projectlistOfWudulist.doLayout();
-                        })
+                        // this.$nextTick(()=>{
+                        //     this.$refs.projectlistOfWudulist.doLayout();
+                        // })
                         this.listHeader = res.data.nameList
                     } else {
                         this.$message({

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -912,6 +912,8 @@ export default {
           if (res.code == "ok") {
             this.syncMembByCardTimeMsg = res.data;
             this.getUser();
+            //人员同步成功，再去同步获取本月的人员
+            this.getCurMonthDayData();
           } else {
             this.syncMembByCardTimeMsg = res.msg;
           }
@@ -921,6 +923,20 @@ export default {
         }
       );
     },
+    getCurMonthDayData() {
+        this.http.post("/wxcorp/getCurMonthDayData",
+        {
+          companyId: this.user.companyId,
+        },
+        (res) => {
+          if (res.code == "ok") {
+          } else {
+          }
+        },
+        (err) => {
+        }
+      );
+    },
     saveContactSecret() {
       if (!this.contactSecret) {
         this.$message({
@@ -2943,6 +2959,23 @@ export default {
     deteFrames(i) {
       this.insertForm.certJson.splice(i, 1);
     },
+    getStaffCountMax() {
+      this.http.post(
+            "/company/getStaffCountMax",
+            {companyId:this.user.companyId},
+            (res) => {
+              if (res.code == "ok") {
+                this.user.company.staffCountMax = res.data;
+              } 
+            },
+            (error) => {
+              this.$message({
+                message: error,
+                type: "error",
+              });
+            }
+          );
+    },
   },
   mounted() {
     this.deactiveDate = util.formatDate.format(new Date(), "yyyy-MM-dd");
@@ -2952,6 +2985,7 @@ export default {
     this.getUsers();
     this.acquireRole();
     this.getProfessional();
+    this.getStaffCountMax();
   },
 };
 </script>