Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

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

@@ -58,7 +58,7 @@ public class UserController {
      * 添加/修改用户
      *
      * 参数：account 账号 username 用户名（账号使用者的名字）parentId 创建此用户的创建者id
-     * password 密码 ,mobile 手机号 ,roleName 角色名称, companyId 所属公司id,projectId 项目id
+     * password 密码 ,mobile 手机号 ,roleName 角色名称, companyId 所属公司id,projectIds 项目ids
      * flag 0-添加，1-修改
      * 注意：创建公司管理员的时候 ，addType 0
      * @return
@@ -66,9 +66,9 @@ public class UserController {
     @ApiOperation("添加/修改用户")
     @RequestMapping("/add")
     @ResponseBody
-    public HttpRespMsg addAndUpdateUser(User user, HttpServletRequest request, Integer flag,@RequestParam(required = false) Integer projectId,
+    public HttpRespMsg addAndUpdateUser(User user, HttpServletRequest request, Integer flag,@RequestParam(required = false) String projectIds,
                                         HttpServletResponse response,@RequestParam(required = false)Integer addType) {
-        HttpRespMsg msg = userService.addAndUpdateUser(user, flag,addType,projectId);
+        HttpRespMsg msg = userService.addAndUpdateUser(user, flag,addType,projectIds);
         return msg;
     }
 

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

@@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface UserService extends IService<User> {
 
-    HttpRespMsg addAndUpdateUser(User user, Integer flag,Integer addType,Integer projectId);
+    HttpRespMsg addAndUpdateUser(User user, Integer flag,Integer addType,String projectIds);
 
     HttpRespMsg login(UserVO userVO, HttpServletRequest request);
 

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

@@ -11,6 +11,7 @@ import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.ListUtil;
 import com.hssx.cloudmodel.util.MD5Util;
 import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.BeanUtils;
@@ -165,7 +166,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public HttpRespMsg addAndUpdateUser(User user, Integer flag, Integer addType, Integer projectId) {
+    public HttpRespMsg addAndUpdateUser(User user, Integer flag, Integer addType, String projectIds) {
         //获取该账号的创建者
         User parentUser = userMapper.selectById(user.getParentId());
         HttpRespMsg msg = new HttpRespMsg();
@@ -245,14 +246,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         if (userCompanyCount == 0) {
                             userCompanyMapper.insert(userCompany);
                         }
-                        //添加一条项目参与人记录
-                        if (projectId != null) {
-                            ProjectUser projectUser = new ProjectUser();
-                            projectUser.setProjectId(projectId);
-                            projectUser.setSubordinate(existingUser.getCompanyId());
-                            projectUser.setUserId(existingUser.getId());
-                            projectUser.setSubordinateType(existingUser.getSubordinateType());
-                            projectUserMapper.insert(projectUser);
+                        //添加项目参与人记录
+                        if (projectIds != null) {
+                            List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(projectIds);
+                            ids.stream().forEach(e ->{
+                                ProjectUser projectUser = new ProjectUser();
+                                projectUser.setProjectId(e);
+                                projectUser.setSubordinate(existingUser.getCompanyId());
+                                projectUser.setUserId(existingUser.getId());
+                                projectUser.setSubordinateType(existingUser.getSubordinateType());
+                                projectUserMapper.insert(projectUser);
+                            });
                         }
                     }
                 } else {
@@ -278,14 +282,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     if (userCompanyCount == 0) {
                         userCompanyMapper.insert(userCompany);
                     }
-                    //添加一条项目参与人记录
-                    if (projectId != null) {
-                        ProjectUser projectUser = new ProjectUser();
-                        projectUser.setProjectId(projectId);
-                        projectUser.setSubordinate(user.getCompanyId());
-                        projectUser.setUserId(user.getId());
-                        projectUser.setSubordinateType(user.getSubordinateType());
-                        projectUserMapper.insert(projectUser);
+                    //添加项目参与人记录
+                    if (projectIds != null) {
+                        List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(projectIds);
+                        ids.stream().forEach(e ->{
+                            ProjectUser projectUser = new ProjectUser();
+                            projectUser.setProjectId(e);
+                            projectUser.setSubordinate(user.getCompanyId());
+                            projectUser.setUserId(user.getId());
+                            projectUser.setSubordinateType(user.getSubordinateType());
+                            projectUserMapper.insert(projectUser);
+                        });
                     }
                 }
             } else if (flag == 1) {
@@ -340,14 +347,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     if (userCompanyCount == 0) {
                         userCompanyMapper.insert(userCompany);
                     }
-                    //添加一条项目参与人记录
-                    if (projectId != null) {
-                        ProjectUser projectUser = new ProjectUser();
-                        projectUser.setProjectId(projectId);
-                        projectUser.setSubordinate(existingUser.getCompanyId());
-                        projectUser.setUserId(existingUser.getId());
-                        projectUser.setSubordinateType(existingUser.getSubordinateType());
-                        projectUserMapper.insert(projectUser);
+                    //添加项目参与人记录
+                    if (projectIds != null) {
+                        ids = ListUtil.convertIntegerIdsArrayToList(projectIds);
+                        ids.stream().forEach(e ->{
+                            ProjectUser projectUser = new ProjectUser();
+                            projectUser.setProjectId(e);
+                            projectUser.setSubordinate(existingUser.getCompanyId());
+                            projectUser.setUserId(existingUser.getId());
+                            projectUser.setSubordinateType(existingUser.getSubordinateType());
+                            projectUserMapper.insert(projectUser);
+                        });
                     }
                 } else {
                     //创建账号默认密码"000000"
@@ -372,14 +382,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     if (userCompanyCount == 0) {
                         userCompanyMapper.insert(userCompany);
                     }
-                    //添加一条项目参与人记录
-                    if (projectId != null) {
-                        ProjectUser projectUser = new ProjectUser();
-                        projectUser.setProjectId(projectId);
-                        projectUser.setSubordinate(user.getCompanyId());
-                        projectUser.setUserId(user.getId());
-                        projectUser.setSubordinateType(user.getSubordinateType());
-                        projectUserMapper.insert(projectUser);
+                    //添加项目参与人记录
+                    if (projectIds != null) {
+                        List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(projectIds);
+                        ids.stream().forEach(e ->{
+                            ProjectUser projectUser = new ProjectUser();
+                            projectUser.setProjectId(e);
+                            projectUser.setSubordinate(user.getCompanyId());
+                            projectUser.setUserId(user.getId());
+                            projectUser.setSubordinateType(user.getSubordinateType());
+                            projectUserMapper.insert(projectUser);
+                        });
                     }
                 }
             } else if (flag == 1) {

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

@@ -53,14 +53,10 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
             list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).orderByDesc("id"));
             Integer count = vnoticeUserMapper.selectCount(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("is_read", 0));
-            boolean isRedPoint = false;
-            if (count > 0) {
-                isRedPoint = true;
-            }
             PageInfo<VnoticeUser> pageInfo = new PageInfo<VnoticeUser>(list);
             Map<String, Object> map = new HashMap<>();
             map.put("list", pageInfo);
-            map.put("isRedPoint", isRedPoint);
+            map.put("isNotRedCount", count);
             msg.data = map;
         } else {
             msg.setError("用户不存在或者未登录");