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/entity/vo/UserVO.java

@@ -32,6 +32,7 @@ public class UserVO extends User {
     private String startTime;
     private String endTime;
     private Integer mouleMap;//用于过滤地图概览
+    private Integer type;
     /**
      */
     private Integer dwgType;

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

@@ -118,6 +118,9 @@
             <if test="userVO.projectId != -1">
                 AND tbm.project_id = #{userVO.projectId}
             </if>
+            <if test="userVO.type == 0">
+                AND tbm.equipment_id is not null
+            </if>
             <if test="userVO.mouleMap == -1">
                 AND tbmp.lng IS NOT NULL and tbmp.lat IS NOT NULL
             </if>
@@ -158,6 +161,9 @@
             <if test="userVO.mouleMap == -1">
                 AND tbmp.lng IS NOT NULL and tbmp.lat IS NOT NULL
             </if>
+            <if test="userVO.type == 0">
+                AND tbm.equipment_id is not null
+            </if>
             AND tbm.project_id in
             <foreach item="item" index="index" collection="list"
                      open="(" separator="," close=")">