权限修改

jwtech-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java

@@ -126,6 +126,8 @@ public class CmsCallBackController {
                     user.setUserType("00");
                 }else if(orgType.equals("SVA")){ //服务
                     user.setUserType("01");
+                }else {
+                    user.setUserType("04");
                 }
             }
             user.setPhonenumber(singleUser.getPhone());

jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java

@@ -337,13 +337,15 @@ public class SysLoginController extends BaseController {
 								sysRoleMenuService.remove(sysRoleMenuQueryWrapper);
 							}
 						}
+						List<SysRoleMenu> sysRoleMenus = new ArrayList<>();
 						for (String menu : menuids) {
 							SysRoleMenu sysRoleMenu = new SysRoleMenu();
 							sysRoleMenu.preInsert();
 							sysRoleMenu.setRoleId(sysRole.getId());
 							sysRoleMenu.setMenuId(menu);
-							sysRoleMenuService.save(sysRoleMenu);
+							sysRoleMenus.add(sysRoleMenu);
 						}
+						sysRoleMenuService.saveBatch(sysRoleMenus);
 					}
 				}
 			}

jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java

@@ -52,14 +52,14 @@ public class TestController extends BaseController
     @GetMapping("test")
     public WaterResult test(){
         WaterResult waterResult = waterRequestUtil.getOrgPage();
-        List<SingleMenu> singleMenus = JSONObject.parseArray(waterResult.getData(), SingleMenu.class);
-        List<SingleMenu> singleAllMenus = new ArrayList<>();
-        setChildren(singleMenus,singleAllMenus);
-        List<String> collect = singleAllMenus.stream().map(singleMenu -> singleMenu.getName()).collect(Collectors.toList());
-//        String records = JSONObject.parseObject(data).getString("records");
-//        List<SingleUser> singleUserList = JSONObject.parseArray(records, SingleUser.class);
-        String join = Joiner.on(",").join(collect);
-        System.out.println(join);
+//        List<SingleMenu> singleMenus = JSONObject.parseArray(waterResult.getData(), SingleMenu.class);
+//        List<SingleMenu> singleAllMenus = new ArrayList<>();
+//        setChildren(singleMenus,singleAllMenus);
+//        List<String> collect = singleAllMenus.stream().map(singleMenu -> singleMenu.getName()).collect(Collectors.toList());
+////        String records = JSONObject.parseObject(data).getString("records");
+////        List<SingleUser> singleUserList = JSONObject.parseArray(records, SingleUser.class);
+//        String join = Joiner.on(",").join(collect);
+//        System.out.println(join);
         return waterResult;
     }
 

jwtech-pc/src/main/java/com/kms/web/controller/common/CommonController.java

@@ -134,11 +134,8 @@ public class CommonController
         String uploadType = JianweiConfig.getUploadType();
         try
         {
-
-
             if (uploadType.equals("FastDFS")) {
                 String fileName = file.getOriginalFilename();
-
                 // 上传并返回文件名称
                 String uploadFile = fastdfs.uploadFile(file);
                 AjaxResult ajax = AjaxResult.success();

jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectInfo.java

@@ -1,6 +1,9 @@
 package com.kms.earlyStage.domain;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.jianwei.common.mybaitsplus.NoQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -94,6 +97,8 @@ public class SpecialProjectInfo extends BaseEntity
      * 行政区划
      */
     @ApiModelProperty("行政区划")
+    @TableField(exist = false)
+    @NoQuery
     private String Adcd;
 
 }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java

@@ -76,9 +76,8 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
 
         SpecialProjectInfo data = sp.getData();
 
-//        String roles = sysUser.getRoleIds().toString();
 
-        if (sysUser.getUserType().equals("00")) {
+        if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
             String deptId = sysUser.getDeptId();
             SysDept sysDept = sysDeptService.get(deptId);
             String xzqhId = sysDept.getXzqhId();
@@ -86,6 +85,7 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
         }
 
         Map<String, Object> params = sp.getParams();
+
         assert sysUser != null;
 
         IPage<SpecialProjectInfo> list1 = null;

jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java

@@ -147,7 +147,7 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
         String deptId = sysUser.getDeptId();
 
         SysDept sysDept = sysDeptService.get(deptId);
-
+        String[] roleIds = sysUser.getRoleIds();
         BsSgcYxjdEnterpriseInfo data = sp.getData();
         IPage<BsSgcYxjdEnterpriseInfo> page = bsSgcYxjdEnterpriseInfoMapper.getByUser(sysUser.getId(),
                 sysUser.getUserType(), data.getProNo(), data.getProCode(),data.getEnterpriseName(),