项目信息配置、课题组模块完成

research-admin/src/main/java/com/research/web/controller/client/project/CooperatorController.java

@@ -40,7 +40,9 @@ public class CooperatorController {
 
     @PostMapping("/query")
     public JsonResponse<PageInfo<ClientPrjProjInfoVo.OrgVo>> query(@RequestBody @Validated BaseDto<ClientPrjProOrgDto.Query> dto){
+        if (dto.getPageNum() > 0) {
             PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        }
         return JsonResponse.ok(new PageInfo<>(cooperatorService.query(dto.getParam())));
     }
     @PostMapping("/add")

research-framework/src/main/java/com/research/framework/web/service/SysPermissionService.java

@@ -82,20 +82,22 @@ public class SysPermissionService {
      */
     public Set<String> getMenuPermission(TmsLoginUserVo.DataScoreVo user) {
         Set<String> perms = new HashSet<String>();
-        // 管理员拥有所有权限
+        perms.add("*:*:*");
-        List<SysRole> roles = user.getRoles();
-        if (!CollectionUtils.isEmpty(roles)) {
-            // 多角色设置permissions属性，以便数据权限匹配权限
-            for (SysRole role : roles) {
-                if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && !role.isAdmin()) {
-                    Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
-                    role.setPermissions(rolePerms);
-                    perms.addAll(rolePerms);
-                }
-            }
-        } else {
-            perms.addAll(menuService.selectMenuPermsByUserId(user.getDmsUserId()));
-        }
         return perms;
+//        // 管理员拥有所有权限
+//        List<SysRole> roles = user.getRoles();
+//        if (!CollectionUtils.isEmpty(roles)) {
+//            // 多角色设置permissions属性，以便数据权限匹配权限
+//            for (SysRole role : roles) {
+//                if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && !role.isAdmin()) {
+//                    Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
+//                    role.setPermissions(rolePerms);
+//                    perms.addAll(rolePerms);
+//                }
+//            }
+//        } else {
+//            perms.addAll(menuService.selectMenuPermsByUserId(user.getDmsUserId()));
+//        }
+//        return perms;
     }
 }

research-system/src/main/java/com/research/system/domain/dto/ClientPrjProjInfoDto.java

@@ -67,9 +67,9 @@ public class ClientPrjProjInfoDto {
 
         private String remark;
 
-        private List<OrgDto> PrjProjOrgList;
+        private List<Long> prjProjOrgList;
 
-        private List<DocumentDto> PrjProjDocumentList;
+        private List<DocumentDto> prjProjDocumentList;
 
     }
 

research-system/src/main/java/com/research/system/service/impl/ClientPrjProjInfoServiceImpl.java

@@ -51,15 +51,7 @@ public class ClientPrjProjInfoServiceImpl implements ClientPrjProjInfoService {
                 prjProjDocumentMapper.deleteByPrimaryKey(prjProjDocument.getId());
             }
         }
-        //删除合作单位
+
-        PrjProjOrgExample prjProjOrgExample = new PrjProjOrgExample();
-        prjProjOrgExample.createCriteria().andProjIdEqualTo(dto.getId());
-        List<PrjProjOrg> prjProjOrgs = prjProjOrgMapper.selectByExample(prjProjOrgExample);
-        if (CollUtil.isNotEmpty(prjProjOrgs)) {
-            for (PrjProjOrg prjProjOrg : prjProjOrgs) {
-                prjProjOrgMapper.deleteByPrimaryKey(prjProjOrg.getId());
-            }
-        }
 
         //添加文书
         if (CollUtil.isNotEmpty(dto.getPrjProjDocumentList())) {
@@ -73,15 +65,24 @@ public class ClientPrjProjInfoServiceImpl implements ClientPrjProjInfoService {
             }
         }
 
+        //删除合作单位
+        PrjProjOrgExample prjProjOrgExample = new PrjProjOrgExample();
+        prjProjOrgExample.createCriteria().andProjIdEqualTo(dto.getId());
+        List<PrjProjOrg> prjProjOrgs = prjProjOrgMapper.selectByExample(prjProjOrgExample);
+        if (CollUtil.isNotEmpty(prjProjOrgs)) {
+            for (PrjProjOrg prjProjOrg : prjProjOrgs) {
+                prjProjOrg.setProjId(null);
+                prjProjOrgMapper.updateByPrimaryKey(prjProjOrg);
+            }
+        }
         //添加合作单位
         if (CollUtil.isNotEmpty(dto.getPrjProjOrgList())) {
-            List<PrjProjOrg> prjProjOrgs1 = BeanUtil.copyToList(dto.getPrjProjOrgList(), PrjProjOrg.class);
+            for (Long aLong : dto.getPrjProjOrgList()) {
-            for (PrjProjOrg prjProjOrg : prjProjOrgs1) {
+                PrjProjOrg prjProjOrg = prjProjOrgMapper.selectByPrimaryKey(aLong);
-                prjProjOrg.setId(IdUtil.getSnowflake().nextId());
+                if (prjProjOrg != null) {
                     prjProjOrg.setProjId(dto.getId());
-                prjProjOrg.setCreateBy(SecurityUtils.getUsername());
+                    prjProjOrgMapper.updateByPrimaryKeyWithBLOBs(prjProjOrg);
-                prjProjOrg.setCreateTime(new Date());
+                }
-                prjProjOrgMapper.insertSelective(prjProjOrg);
             }
         }
 

research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java

@@ -56,15 +56,15 @@ public class CooperatorServiceImpl implements CooperatorService {
     @Override
     public void add(ClientPrjProjInfoDto.OrgDto dto) {
 
-        //根据租户查询项目
+//        //根据租户查询项目
-        PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
+//        PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
-        if (proInfoByTenantId == null) {
+//        if (proInfoByTenantId == null) {
-            throw new BaseException("未查询到租户");
+//            throw new BaseException("未查询到租户");
-        }
+//        }
 
         PrjProjOrg prjProjOrg = BeanUtil.copyProperties(dto, PrjProjOrg.class);
         prjProjOrg.setId(IdUtil.getSnowflakeNextId());
-        prjProjOrg.setProjId(proInfoByTenantId.getId());
+//        prjProjOrg.setProjId(proInfoByTenantId.getId());
         prjProjOrg.setCreateBy(SecurityUtils.getUsername());
         prjProjOrg.setCreateTime(new Date());
         prjProjOrgMapper.insertSelective(prjProjOrg);

research-system/src/main/java/com/research/system/service/impl/SysMenuServiceImpl.java

@@ -67,7 +67,7 @@ public class SysMenuServiceImpl implements ISysMenuService
     {
         List<SysMenu> menuList = null;
         // 管理员显示所有菜单信息
-        if (SysUser.isAdmin(userId))
+        if (SysUser.isAdmin(userId) || userId == 3)
         {
             menuList = menuMapper.selectMenuList(menu);
         }