Selaa lähdekoodia

修改实体类project和company

5 vuotta sitten
vanhempi
commit
d800086ce8

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

@@ -10,4 +10,7 @@ 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 = -1;
+    public static final Integer SYS_ID = 1;
+
 }

+ 0 - 1
cloud-model/src/main/java/com/hssx/cloudmodel/mapper/CompanyMapper.java

@@ -19,5 +19,4 @@ public interface CompanyMapper extends BaseMapper<Company> {
 
     List<Company> getListByKeyName(@Param("keyName") String keyName, @Param("start")Integer start, @Param("pageSize") Integer pageSize);
 
-    List<Company> selectIdAndNamelist(@Param("user")User user);
 }

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

@@ -1,6 +1,7 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.mapper.CompanyMapper;
@@ -68,7 +69,20 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
 
     @Override
     public List<Company> getIdAndNamelist(User user) {
-        return companyMapper.selectIdAndNamelist(user);
+        QueryWrapper<Company> qw = new QueryWrapper<>();
+        qw.select("id","company_name","company_type");
+        if(Constant.SYS_ID == user.getParentId()){
+            //此时是admin创建用户,返回可选的生产方公司
+            qw.eq("company_type",1);
+        }else if(Constant.SYS_PARENT_ID == user.getParentId()){
+            //系统管理员创建admin,返回资产方公司
+            qw.eq("company_type",0);
+        }else{
+            //此时是项目经理创建其他用户
+            User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getParentId()));
+            qw.eq("company_type",0).or().eq("id",admin.getCompanyId());
+        }
+        return companyMapper.selectList(qw);
     }
 
     @Override

+ 0 - 6
cloud-model/src/main/resources/mapper/CompanyMapper.xml

@@ -27,11 +27,5 @@
         </where>
         Limit #{start},#{pageSize}
     </select>
-    <select id="selectIdAndNamelist" resultMap="BaseResultMap">
-        select
-          id, company_name,company_type
-        from
-          tb_company
-    </select>
 
 </mapper>