bug

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -323,12 +323,18 @@ public class WbsTreeContractController extends BladeController {
                     for (Element childElement : childElements) {
                         String keyName = childElement.attr("keyname");
                         if (StringUtils.isNotEmpty(keyName)) {
-                            //解析日期格式是否是范围格式
                             String dateFormatPattern = "yyyy年MM月dd日-yyyy年MM月dd日";
                             if (isValidDateFormat(value, dateFormatPattern)) {
+                                //解析日期格式是否为范围格式，范围日期返回数组
                                 String[] splitDate = value.split("-");
                                 List<String> strings = Arrays.asList(splitDate[0], splitDate[1]);
                                 resultDataMap.put(keyName, strings);
+                            } else if (value.contains("年") && value.contains("月") && value.contains("日")) {
+                                //解析日期格式是否为单日期格式，那么剔除空格返回
+                                String replace = value.replace(" ", "");
+                                if (!replace.equals("年月日")) {//如果为空那么返回
+                                    resultDataMap.put(keyName, value.replace(" ", ""));
+                                }
                             } else {
                                 resultDataMap.put(keyName, value);
                             }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -415,15 +415,15 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
     public List<AppWbsTreeContractVO> searchNodeAllTable(String primaryKeyId, String tableOwner, String contractId, String projectId) {
 
         //由于fegin 调用时，获取不到UserId
-        Long userId =-1L;
-        if(primaryKeyId.indexOf(":")>=0){
+        Long userId = -1L;
+        if (primaryKeyId.indexOf(":") >= 0) {
             String ds[] = primaryKeyId.split(":");
             primaryKeyId = ds[0];
             userId = Long.parseLong(ds[1]);
-            if(userId == -1L){
-                userId =  AuthUtil.getUserId();
+            if (userId == -1L) {
+                userId = AuthUtil.getUserId();
             }
-        }else{
+        } else {
             userId = AuthUtil.getUserId();
         }
         WbsTreeContract wbsTreeContract = baseMapper.selectOne(Wrappers.<WbsTreeContract>query().lambda()
@@ -435,7 +435,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         //当前项目合同段只会存在一个角色roleId
         SaveUserInfoByProject userInfo = baseMapper.selectRoleInfo(userId, contractId, projectId);
         if (userInfo == null) {
-            throw new ServiceException("请先分配当前用户对该合同段的角色信息="+ SecureUtil.getUserId());
+            throw new ServiceException("请先分配当前用户对该合同段的角色信息=" + SecureUtil.getUserId());
         }
         String roleId = userInfo.getRoleId();
 
@@ -709,6 +709,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
                             //返回最终结果集
                             for (WbsTreeContractLazyVO lazyNodeVO : lazyNodes) {
+                                lazyNodeVO.setType(lazyNodeVO.getNodeType()); //前端显示需要一样的，所以修改成一样的
                                 lazyNodeVO.setNotExsitChild(!lazyNodeVO.getHasChildren().equals(1));
                                 lazyNodeVO.setPrimaryKeyId(lazyNodeVO.getPKeyId());
                                 if (lazyNodeVO.getParentId() == 0L) {
@@ -839,6 +840,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
                                     //返回最终结果集
                                     for (WbsTreeContractLazyVO lazyNodeVO : lazyNodes) {
+                                        lazyNodeVO.setType(lazyNodeVO.getNodeType()); //前端显示需要一样的，所以修改成一样的
                                         lazyNodeVO.setNotExsitChild(!lazyNodeVO.getHasChildren().equals(1));
                                         lazyNodeVO.setPrimaryKeyId(lazyNodeVO.getPKeyId());
                                         lazyNodeVO.setContractIdRelation(sgContractId);
@@ -906,8 +908,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                         .collect(Collectors.groupingBy(TableFile::getTabId));
                 List<AppWbsTreeContractVO> voList = new ArrayList<>();
                 for (AppWbsTreeContractVO vo : vos) {
-                    if (map.get(vo.getPKeyId()+"") != null && map.get(vo.getPKeyId()+"").size() > 0) {
-                        vo.setFileList(map.get(vo.getPKeyId()+""));
+                    if (map.get(vo.getPKeyId() + "") != null && map.get(vo.getPKeyId() + "").size() > 0) {
+                        vo.setFileList(map.get(vo.getPKeyId() + ""));
                         voList.add(vo);
                     }
                 }