用户创建的修改

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

@@ -2,13 +2,11 @@ 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.Factory;
-import com.hssx.cloudmodel.entity.LngLatCompany;
-import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.CompanyVO;
 import com.hssx.cloudmodel.mapper.CompanyMapper;
 import com.hssx.cloudmodel.mapper.LngLatCompanyMapper;
+import com.hssx.cloudmodel.mapper.ProjectMapper;
 import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -38,6 +36,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     UserMapper userMapper;
     @Resource
     LngLatCompanyMapper lngLatCompanyMapper;
+    @Resource
+    ProjectMapper projectMapper;
 
     @Override
     public HttpRespMsg addAndUpdateRole(CompanyVO companyVO, Integer flag) {
@@ -126,7 +126,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             qw.eq("company_type", Constant.ASSETS_COMPANY);
         } else {
             //此时是项目经理创建其他用户
-
+//            projectMapper.selectList(new QueryWrapper<Project>().eq(""))
             User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getParentId()));
             qw.eq("company_type", Constant.PRODUCER_COMPANY).or().eq("id", admin.getCompanyId());
         }

cloud-model/src/main/resources/mapper/MouldEquipmentMapper.xml

@@ -74,7 +74,7 @@
                 and tbme.belong_company_id = #{companyId}
             </if>
             <if test="keyName != null and keyName != ''">
-                and tbme.equipment_no like concat('%',#{keyName},'%');
+                and tbme.equipment_no like concat('%',#{keyName},'%')
             </if>
         </where>
     </select>