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/constant/Constant.java

@@ -54,6 +54,7 @@ public class Constant {
     public static final String MAINTAIN_WAY_SECOND = "检查";//对应保养类型动作
     public static final String PART_FILE_2D = "2D";//零件2d
     public static final String PART_FILE_3D = "3D";//零件3d
+    public static final Double ELECTRICITY_THRESHOLD = 0.2;//电量阈值
 //    public static void main(String[] args){
 //        System.out.println("222222");
 //        String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="

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

@@ -524,7 +524,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             msg.setError("当前用户未登录，或者用户不存在");
             return msg;
         } else {
-            if (Constant.SYS_ID == user.getId()) {
+            if (Constant.SYS_ID == user.getParentId()) {
                 //admin创建人员,获取该公司下的所有项目
                 list =  projectMapper.selectList(new QueryWrapper<Project>().eq("owner_company", user.getCompanyId()));
             }else{

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

@@ -94,6 +94,8 @@
         <result column="pindate" property="indate" />
         <result column="manager_id" property="managerId" />
         <result column="manager" property="manager" />
+        <result column="owner_company" property="ownerCompany" />
+        <result column="owner_company_name" property="ownerCompanyName" />
         <collection property="models" ofType="com.hssx.cloudmodel.entity.Mould">
             <id column="model_id" property="id" />
             <result column="model_no" property="modelNo" />