Merge remote-tracking branch 'origin/V0.0.9' into V0.0.9

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/OwnershipConverter.java

@@ -28,9 +28,9 @@ public class OwnershipConverter implements Converter<Integer> {
 
     @Override
     public CellData convertToExcelData(Integer s, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
-        if ("1".equals(s)) {
+        if (null != s && s == 1) {
             return new CellData("部分自有+部分租赁");
-        }else if ("2".equals(s)){
+        }else if (null != s && s == 2){
             return new CellData("自有");
         }else {
             return new CellData("租赁");

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -1008,15 +1008,13 @@ and
             IFNULL( SUM( a.cash_adding_room_control_count ), 0 ) AS cashAddingRoomControlCount,
             IFNULL( SUM( a.remote_control_count ), 0 ) AS remoteControlCount
         FROM
-            sys_org_extend a
-                LEFT JOIN sys_org b ON a.org_id = b.id
+            ( SELECT * FROM sys_org WHERE type = 10 and is_lock = 0 and deleted = 0 AND path LIKE concat( #{orgPath}, '%' )  ORDER BY create_time DESC LIMIT 0, 1 ) b
+            LEFT JOIN sys_org_extend a ON a.org_id = b.id
         where
             1=1
           and b.type = 10
-/*          and a.remote_control = 1*/
           and b.deleted = 0
           and b.is_lock = 0
-          and b.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getDuty" resultType="java.util.Map">
         SELECT

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysPhysicalDefenseConstructionMapper.xml

@@ -50,14 +50,13 @@
 
     <select id="selectListByPath" resultType="com.xunmei.system.dto.SysPhysicalDefenseConstructionDTO">
         select op.*,o.path as orgPath from sys_org o INNER JOIN sys_org_physical_defense_construction op ON o.id = op.org_id
-        <where>
-            <if test="type != null  and type != ''">
-                and op.type = #{type}
-            </if>
-            <if test="orgPath != null  and orgPath != ''">
-                and o.path LIKE concat(#{orgPath}, '%')
-            </if>
-        </where>
+        where o.is_lock != 1 and o.deleted = 0
+        <if test="type != null  and type != ''">
+            and op.type = #{type}
+        </if>
+        <if test="orgPath != null  and orgPath != ''">
+            and o.path LIKE concat(#{orgPath}, '%')
+        </if>
     </select>