修改添加项目

cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java

@@ -62,7 +62,7 @@ public class RoleController {
     public HttpRespMsg deleteRole(Role role, HttpServletRequest request,
                                HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = roleService.deleteById(role.getId());
+        msg = roleService.deleteById(role.getId());
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/controller/UserController.java

@@ -132,7 +132,7 @@ public class UserController {
     public HttpRespMsg deleteUser(User user, HttpServletRequest request,
                                   HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = userService.removeById(user.getId());
+        msg.data= userService.removeById(user.getId());
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java

@@ -8,6 +8,7 @@ import com.hssx.cloudmodel.entity.ProjectUser;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.mapper.ProjectMapper;
 import com.hssx.cloudmodel.mapper.ProjectUserMapper;
+import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.ProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
@@ -36,6 +37,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     ProjectMapper projectMapper;
     @Autowired
     ProjectUserMapper projectUserMapper;
+    @Autowired
+    UserMapper userMapper;
 
     @Override
     public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user) {
@@ -73,14 +76,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Override
     public HttpRespMsg handOutProject(Project project, String userIds) {
         HttpRespMsg msg = new HttpRespMsg();
+        Project pro = projectMapper.selectById(project.getId());
         List<Integer> ids = new ArrayList<>();
         if(userIds != null && userIds != ""){
             List<String> list = ListUtil.convertLongIdsArrayToList(userIds);
             if(list().size()>0){
                 for(String id:list){
+                    User user = userMapper.selectById(id);
                     ProjectUser projectUser = new ProjectUser();
                     projectUser.setId(Integer.parseInt(id));
                     projectUser.setProjectId(project.getId());
+                    projectUser.setSubordinate(user.getSubordinateType());
                     projectUserMapper.insert(projectUser);
                 }
             }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -86,6 +86,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 user.setHeadImgurl(UUID.randomUUID().toString().replaceAll("-", ""));
                 //获取角色所属的团体
                 Role role = roleMapper.selectById(user.getRoleType());
+                if("客户".equals(role.getSubordinate())){
+                    user.setSubordinateType(1);
+                }else if("供应商".equals(role.getSubordinate())){
+                    user.setSubordinateType(0);
+                }
                 user.setTeamName(role.getSubordinate());
                 userMapper.insert(user);
             }