启用新版企业微信通讯录同步方式

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

@@ -99,7 +99,8 @@ public class ProjectRequirementController {
             taskGroupUserIds=groupParticipatorList.stream().map(GroupParticipator::getUserId).collect(Collectors.toList());
             taskGroupUserIds.add("-1");
         }
-        List<ProjectRequirement> projectRequirements = projectRequirementMapper.customSelect(wxCorpInfo.getSaasSyncContact(),companyId, startDate, projectId, projectIds.size()==0?null:projectIds, startIndex, pageSize,reStartDate,reEndDate,taskGroupUserIds.size()==0?null:taskGroupUserIds);
+        int needCorpwxUserId = (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact() == 1) ?1 : 0;
+        List<ProjectRequirement> projectRequirements = projectRequirementMapper.customSelect(needCorpwxUserId,companyId, startDate, projectId, projectIds.size()==0?null:projectIds, startIndex, pageSize,reStartDate,reEndDate,taskGroupUserIds.size()==0?null:taskGroupUserIds);
         List<Integer> ids = projectRequirements.stream().map(pr -> pr.getProjectId()).collect(Collectors.toList());
         List<Task> milepostList=taskMapper.selectMilepost(ids.size()==0?null:ids);
         projectRequirements.forEach(pr->{
@@ -137,7 +138,8 @@ public class ProjectRequirementController {
             taskGroupUserIds=groupParticipatorList.stream().map(GroupParticipator::getUserId).collect(Collectors.toList());
             taskGroupUserIds.add("-1");
         }
-        List<ProjectRequirement> projectRequirementList = projectRequirementMapper.customSelect(wxCorpInfo.getSaasSyncContact(),companyId,startDate, projectId,  projectIds.size()==0?null:projectIds, null, null,null,null,taskGroupUserIds.size()==0?null:taskGroupUserIds);
+        int needCorpwxUserId = (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact() == 1) ?1 : 0;
+        List<ProjectRequirement> projectRequirementList = projectRequirementMapper.customSelect(needCorpwxUserId,companyId,startDate, projectId,  projectIds.size()==0?null:projectIds, null, null,null,null,taskGroupUserIds.size()==0?null:taskGroupUserIds);
         List<Integer> collect = projectRequirementList.stream().map(pr -> pr.getProjectId()).collect(Collectors.toList());
         List<Task> milepostList=taskMapper.selectMilepost(collect);
         projectRequirementList.forEach(pr->{

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

@@ -846,7 +846,7 @@ public class WeiXinCorpController {
         HttpEntity<String> requestEntity = new HttpEntity<String>(reqParam.toJSONString(), headers);
         ResponseEntity<String> responseEntity = this.restTemplate.exchange(url,
                 HttpMethod.POST, requestEntity, String.class);
-        boolean enableNewVersion = false;
+        boolean enableNewVersion = true;
         if (responseEntity.getStatusCode() == HttpStatus.OK) {
             String resp = responseEntity.getBody();
             log.info(resp);
@@ -1599,6 +1599,7 @@ public class WeiXinCorpController {
                     .setCorpwxUserid(openUserid)
                     .setCorpwxRealUserid(curUserid)
                     .setColor(ColorUtil.randomColor())
+                    .setPassword(MD5Util.getPassword("000000"))
                     .setJobNumber(curUserid)
                     .setCorpwxDeptid(maxDeptId);
             allCorpWxUserList.add(user);
@@ -1656,6 +1657,7 @@ public class WeiXinCorpController {
                                 .setCorpwxRealUserid(curUserid)
                                 .setColor(ColorUtil.randomColor())
                                 .setJobNumber(curUserid)
+                                .setPassword(MD5Util.getPassword("000000"))
                                 .setCorpwxDeptid(curDept.getCorpwxDeptid());
                         allCorpWxUserList.add(user);
                     }

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

@@ -827,7 +827,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
             //日报审核人表
             List<String> auditorIds = new ArrayList<>();
-            if (StringUtils.isEmpty(auditUserIds) || "[]".equals(auditUserIds)) {
+            if (StringUtils.isEmpty(auditUserIds) || "[]".equals(auditUserIds) || "undefined".equals(auditUserIds)) {
                 if (inchargerId != null) {
                     auditorIds.add(inchargerId);
                 }

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,19 +1,19 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-var ip = '47.101.180.183'
+// var ip = '47.101.180.183'
 // var ip = '192.168.10.6'
 // var ip = '192.168.2.6'
 
-// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-// for (var i in ifaces) {
-//     for (var j in ifaces[i]) {
-//         var val = ifaces[i][j]
-//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-//             ip = val.address
-//         }
-//     }
-// }
+var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+for (var i in ifaces) {
+    for (var j in ifaces[i]) {
+        var val = ifaces[i][j]
+        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+            ip = val.address
+        }
+    }
+}
 // 1196735749
 module.exports = {
   build: {

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

@@ -206,7 +206,6 @@
         methods: {
             echartsCurrentChange(val){
                 this.page = val
-                // console.log('CurrentChange');
                 if(this.radio == this.$t('ren-yuan')){
                     this.gtff()
                 }else{
@@ -451,6 +450,7 @@
                         } else {
                             this.personnelAll = res.data
                             this.allListData = res.data
+                            console.log('人员返回', this.allListData);
                             this.gtff()
                         }
                     } else {
@@ -956,8 +956,8 @@
                         else {
                             // list = res.data
                             // this.allListData = res.data
-                            this.total = this.allListData.length
-                            list = this.allListData.slice(0+50*(this.page-1),49+50*(this.page-1))
+                            this.total = this.allListData.list.length
+                            list = this.allListData.list.slice(0+50*(this.page-1),49+50*(this.page-1))
                             
                             for(var i in list) {
                                 // console.log(list[i].name, list[i].costMoney, list[i].cost)

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

@@ -3834,7 +3834,9 @@ a {
                         formData.append("associateDegrees", listId)
                         formData.append("associateDegreeNames", listName)
                         //日报审核人
-                        formData.append("auditUserIds", JSON.stringify(this.addForm.auditUserIds));
+                        if (this.addForm.auditUserIds) {
+                            formData.append("auditUserIds", JSON.stringify(this.addForm.auditUserIds));
+                        }
 
                         if(this.addForm.category != null) {
                             formData.append("category", this.addForm.category);