获取 应用权限接口

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

@@ -121,6 +121,10 @@ public class WeiXinCorpController {
     public static String PRE_AUTH_CODE = null;
     public static long expireTime = 0L;
 
+    // 随机数
+    String nonce_str = Sha1Util.getNonceStr();
+    String timestamp = Sha1Util.getTimeStamp();
+
     public static Map<String, Item> corpTicketMap = new HashMap<String,Item>();
     public class Item {
         public String jsTicket = null;
@@ -156,7 +160,6 @@ public class WeiXinCorpController {
         try {
             User user = userMapper.selectById(token);
             WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-
             Item item = corpTicketMap.get(wxCorpInfo.getCorpid());
             if (item == null || item.expireTime.isBefore(LocalDateTime.now())) {
                 //重新获取
@@ -182,8 +185,8 @@ public class WeiXinCorpController {
             }
             log.info("jsTicket = " + item.jsTicket);
             // 随机数
-            String nonce_str = Sha1Util.getNonceStr();
-            String timestamp = Sha1Util.getTimeStamp();
+/*            String nonce_str = Sha1Util.getNonceStr();
+            String timestamp = Sha1Util.getTimeStamp();*/
             // 对以下字段进行签名
             SortedMap<String, String> packageParams = new TreeMap<String, String>();
             packageParams.put("jsapi_ticket", item.jsTicket);
@@ -234,9 +237,6 @@ public class WeiXinCorpController {
                 return msg;
             }
             System.out.println("jsTicket = " + agentItem.jsTicket);
-            // 随机数
-            String nonce_str = Sha1Util.getNonceStr();
-            String timestamp = Sha1Util.getTimeStamp();
             // 对以下字段进行签名
             SortedMap<String, String> packageParams = new TreeMap<String, String>();
             SortedMap<String, String> packageParam = new TreeMap<String, String>();

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

@@ -6465,12 +6465,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     project.setCompanyId(thirdPartyInterface.getCompanyId());
                     inertProjectList.add(project);
                 }
-                if(saveBatch(inertProjectList)){
+                if(inertProjectList.size()>0&&saveBatch(inertProjectList)){
                     //message+="成功添加"+inertProjectList.size()+"条项目数据";
                     message+=MessageUtils.message("project.upDataSuc",inertProjectList.size());
                 }
                 for (Project project : inertProjectList) {
                     List<TaskGroup> taskGroupList = project.getTaskGroupList();
+                    if(taskGroupList==null){
+                        continue;
+                    }
                     taskGroupList.forEach(tl->tl.setProjectId(project.getId()));
                     taskGroupService.saveBatch(taskGroupList);
                 }
@@ -6485,14 +6488,18 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         changeProjectList.add(project);
                     }else continue;
                 }
-                if(updateBatchById(changeProjectList)){
+                if(changeProjectList.size()>0&&updateBatchById(changeProjectList)){
                     //message+="成功更新"+changeProjectList.size()+"条项目数据";
                     message+=MessageUtils.message("project.upDataSuc",changeProjectList.size());
                 }
                 List<Integer> idList = changeProjectList.stream().map(Project::getId).collect(Collectors.toList());
+                idList.add(-1);
                 List<TaskGroup> groupList = taskGroupMapper.selectList(new QueryWrapper<TaskGroup>().in("project_id", idList));
                 for (Project project : changeProjectList) {
                     List<TaskGroup> taskGroupList = project.getTaskGroupList();
+                    if(taskGroupList==null){
+                        continue;
+                    }
                     for (TaskGroup taskGroup : taskGroupList) {
                         taskGroup.setProjectId(project.getId());
                         Optional<TaskGroup> first = groupList.stream().filter(gl -> gl.getTaskGroupCode() != null && gl.getTaskGroupCode().equals(taskGroup.getTaskGroupCode())).findFirst();
@@ -6511,7 +6518,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     deleteProjectList.add(project);
                 }else continue;
                 List<Integer> idList = deleteProjectList.stream().map(Project::getId).collect(Collectors.toList());
-                if(removeByIds(idList)){
+                if(deleteProjectList.size()>0&&removeByIds(idList)){
                     //message+="成功删除"+idList.size()+"条项目数据";
                     message+=MessageUtils.message("project.deleteDate",idList.size());
                 }