权限管理修改

jwtech-system/src/main/java/com/kms/common/api/CommonApi.java

@@ -155,21 +155,25 @@ public class CommonApi {
     }
 
     @GetMapping("/isLegal")
-    public Boolean isLegal() {
+    public AjaxResult isLegal() {
         SysUser user = UserUtils.getUser();
         List<SysRole> sysRoles = sysRoleService.getRoleByUserId(user.getId());
         List<SysRole> legalPerson = sysRoles.stream().filter(x -> x.getRoleKey().equals("legalPerson")).collect(Collectors.toList());
 
         if (CollectionUtil.isEmpty(legalPerson)) {
-            return true;
+            return AjaxResult.success(true);
         } else {
-            LambdaQueryWrapper<SysUserPro> queryWrapper = Wrappers.lambdaQuery(SysUserPro.class).eq(SysUserPro::getUserId, user.getId());
+            LambdaQueryWrapper<SysUserPro> queryWrapper = Wrappers.lambdaQuery(SysUserPro.class)
+                    .eq(SysUserPro::getUserId, user.getId());
 
             List<SysUserPro> list = sysUserProService.list(queryWrapper);
             if (CollectionUtil.isEmpty(list)) {
-                return false;
-            } else {
-                return true;
+                return AjaxResult.success(false);
+            } else if (CollectionUtil.isNotEmpty(list)&& list.stream().filter(x -> Objects.equals(x.getStatus(), "1")).count() == 0){
+                return AjaxResult.error("审核未通过,请重新选择", false);
+            }else {
+                return AjaxResult.success(true);
+
             }
         }
 
@@ -179,7 +183,7 @@ public class CommonApi {
     public AjaxResult bindPro(@RequestBody List<String> proNos) {
         SysUser user = UserUtils.getUser();
         List<SysUserPro> proList = proNos.stream()
-                .map(x -> new SysUserPro(x, user.getId(), user.getId(), null))
+                .map(x -> new SysUserPro(x, user.getId(), user.getId(), null,"0"))
                 .collect(Collectors.toList());
 
         return AjaxResult.success(sysUserProService.saveBatch(proList));

jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java

@@ -98,7 +98,7 @@ public class SpecialProjectInfoController extends BaseController {
 
         List<String> roleKey = sysRoles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
         if (roleKey.contains("legalPerson")) {
-            LambdaQueryWrapper<SysUserPro> queryWrapper = Wrappers.lambdaQuery(SysUserPro.class).eq(SysUserPro::getUserId, userId);
+            LambdaQueryWrapper<SysUserPro> queryWrapper = Wrappers.lambdaQuery(SysUserPro.class).eq(SysUserPro::getUserId, userId).eq(SysUserPro::getStatus,"1");
 
             List<String> proNoList = sysUserProService.list(queryWrapper).stream().map(SysUserPro::getProNo).collect(Collectors.toList());
 

jwtech-system/src/main/java/com/kms/system/domain/SysUserPro.java

@@ -49,4 +49,6 @@ public class SysUserPro extends BaseEntity
     @ApiModelProperty("${comment}")
     private String updateUid;
 
+    private String status;
+
 }