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/service/impl/CompanyServiceImpl.java

@@ -15,6 +15,7 @@ import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.ListUtil;
 import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -53,6 +54,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     CustomCompanyMapper customCompanyMapper;
 
 
+
     @Override
     public HttpRespMsg addAndUpdateRole(CompanyVO companyVO, Integer flag, String companyIds) {
         HttpRespMsg msg = new HttpRespMsg();

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

@@ -17,6 +17,7 @@ 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.PageUtil;
+import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.operators.arithmetic.Concat;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,7 @@ import java.util.List;
  * @since 2019-08-06
  */
 @Service
+@Slf4j
 public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements PowerService {
     @Resource
     PowerMapper powerMapper;
@@ -86,7 +88,9 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
         if (user != null) {
             Project pro = projectMapper.selectById(userVO.getProjectId());
-            if (pro.getCreatorId() == user.getId() || pro.getManagerId() == user.getId()) {
+            log.info("project=======>"+pro);
+            log.info("user====>"+user);
+            if (pro.getManagerId() == user.getId()) {
                 //资产方管理员或者担任项目经理的人才可修改人员权限
                 if (null != userVO.getPowers()) {
                     List<Integer> powerTypes = ListUtil.convertIntegerIdsArrayToList(userVO.getPowers());