修改实体类project和company

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

@@ -7,11 +7,11 @@ package com.hssx.cloudmodel.constant;
  * Version: 1.0
  */
 public class Constant {
-    public static final String DEFAULT_PWD = "000000";
-    public static final Integer ASSETS_COMPANY = 0;
-    public static final Integer PRODUCER_COMPANY = 1;
-    public static final Integer SYS_PARENT_ID = 0;
-    public static final Integer SYS_ID = 1;
+    public static final String DEFAULT_PWD = "000000";//默认密码
+    public static final Integer ASSETS_COMPANY = 0;//资产方编号
+    public static final Integer PRODUCER_COMPANY = 1;//生产方编号
+    public static final Integer SYS_PARENT_ID = 0;//系统管理员的上级id
+    public static final Integer SYS_ID = 1;//系统管理员的id
 
 
 }

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

@@ -72,8 +72,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         QueryWrapper<Company> qw = new QueryWrapper<>();
         qw.select("id","company_name","company_type");
         if(Constant.SYS_ID == user.getParentId()){
-            //此时是admin创建用户,返回可选的生产方公司
-            qw.eq("company_type",Constant.PRODUCER_COMPANY);
+            //此时是admin创建用户,返回可选的生产方公司,查询出当前admin的信息并获取他的公司id
+            User admin = userMapper.selectOne(new QueryWrapper<User>().eq("parent_id", user.getParentId()));
+            qw.eq("company_type",Constant.PRODUCER_COMPANY).or().eq("id",admin.getCompanyId());
         }else if(Constant.SYS_PARENT_ID == user.getParentId()){
             //系统管理员创建admin,返回资产方公司
             qw.eq("company_type",Constant.ASSETS_COMPANY);