Selaa lähdekoodia

项目返回参与者id与name3

Reiskuchen 5 vuotta sitten
vanhempi
commit
1dccc472de

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java

@@ -19,7 +19,7 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg getProjectPage(Integer pageIndex, Integer pageSize, HttpServletRequest request);
 
-    HttpRespMsg editProject(Integer id, String name, String[] userId, HttpServletRequest request);
+    HttpRespMsg editProject(Integer id, String name, String[] userIds, HttpServletRequest request);
 
     HttpRespMsg deleteProject(Integer id);
 

+ 2 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DepartmentServiceImpl.java

@@ -39,9 +39,11 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
+            //未输入上级部门 或者 输入的上级部门id存在且为同一公司时
             if (superiorId == null || departmentMapper.selectCount(new QueryWrapper<Department>()
                     .eq("department_id", superiorId)
                     .eq("company_id", companyId)) == 1) {
+//                String
                 Department department = new Department()
                         .setDepartmentName(departmentName)
                         .setSuperiorId(superiorId)

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

@@ -113,8 +113,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             }
             //编辑关系
             participationMapper.delete(new QueryWrapper<Participation>().eq("project_id", id));
-            for (String userId : userIds) {
-                participationMapper.insert(new Participation().setProjectId(id).setUserId(userId));
+            if (userIds != null) {
+                for (String userId : userIds) {
+                    participationMapper.insert(new Participation().setProjectId(id).setUserId(userId));
+                }
             }
         } catch (NullPointerException e) {
             httpRespMsg.setError("验证失败");