修改实体类project和company

cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java

@@ -7,10 +7,7 @@ package com.hssx.cloudmodel.constant;
  * Version: 1.0
  */
 public class Constant {
-    public static final String SYS_USER = "sysUserInfo";
-    public static final String COMMON_USER = "UserInfo";
-    public static final Integer SYSTEM_ID = 1;
     public static final String DEFAULT_PWD = "000000";
-    public static final Integer PAGE_NUM = 1;
-    public static final Integer PAGE_SIZE = 10;
+    public static final Integer ASSETS_COMPANY = 0;
+    public static final Integer PRODUCER_COMPANY = 1;
 }

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

@@ -69,8 +69,7 @@ public class UserController {
      *
      * 参数：account 账号 username 用户名（账号使用者的名字）
      * password 密码 ,mobile 手机号 ,roleName 角色名称, companyId 所属公司id
-     * teamName 团体名称 ：客户方、供应方
-     * flag 0-添加，1-修改 subordinateType 所属团队 0-供应商 1-客户
+     * flag 0-添加，1-修改
      * @return
      */
     @ApiOperation("添加/修改用户")

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

@@ -3,8 +3,11 @@ package com.hssx.cloudmodel.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hssx.cloudmodel.constant.Constant;
+import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.UserVO;
+import com.hssx.cloudmodel.mapper.CompanyMapper;
 import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,6 +33,8 @@ import java.util.UUID;
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
     @Autowired
     UserMapper userMapper;
+    @Autowired
+    CompanyMapper companyMapper;
 
     @Override
     public HttpRespMsg login(User user, HttpServletRequest request) {
@@ -77,13 +82,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 msg.setError("账号已存在，请输入其他账号");
             } else {
                 //创建账号默认密码"000000"
-                user.setPassword(MD5Util.getPassword("000000"));
+                user.setPassword(MD5Util.getPassword(Constant.DEFAULT_PWD));
                 user.setHeadImgurl(UUID.randomUUID().toString().replaceAll("-", ""));
                 //获取角色所属的团体
-                if("资产方".equals(user.getTeamName())){
-                    user.setSubordinateType(0);
-                }else if("生产方".equals(user.getTeamName())){
-                    user.setSubordinateType(1);
+                Company company = companyMapper.selectById(user.getCompanyId());
+                if(Constant.ASSETS_COMPANY == company.getCompanyType()){
+                    user.setSubordinateType(Constant.ASSETS_COMPANY );
+                    user.setTeamName("资产方");
+                }else if(Constant.PRODUCER_COMPANY == company.getCompanyType()){
+                    user.setSubordinateType(Constant.PRODUCER_COMPANY);
+                    user.setTeamName("生产方");
                 }
                 userMapper.insert(user);
             }