修改后台使用其他系统管理功能，

修改安全信息管理初始进入无法渲染系统名称的问题

spring-cloud/server-basic/src/main/java/com/jd/mapper/OtherBusinessSystemMapper.java

@@ -36,6 +36,19 @@ public interface OtherBusinessSystemMapper {
     List<Map<String, Object>> getAllOtherSystem(Map<String, Object> param);
 
     /**
+     *
+     * @param officeId
+     * @return
+     */
+    Integer CountSystemByOffice(Integer officeId);
+
+    /**
+     * 根据系统名称查询单位类型
+     * @return
+     */
+    Map<String, Object> getOfficeBySysName(String systemName);
+
+    /**
      * 通过NMAE查询单位数量
      * @return
      */

spring-cloud/server-basic/src/main/java/com/jd/service/impl/OfficeServiceImpl.java

@@ -5,6 +5,7 @@ import com.jd.entity.AttackType;
 import com.jd.entity.Office;
 import com.jd.mapper.BusinessSystemMapper;
 import com.jd.mapper.OfficeMapper;
+import com.jd.mapper.OtherBusinessSystemMapper;
 import com.jd.service.OfficeService;
 import com.jd.util.Blank;
 import com.jd.util.SendUtil;
@@ -27,7 +28,7 @@ import java.util.Map;
 public class OfficeServiceImpl implements OfficeService {
 
     @Autowired
-    private BusinessSystemMapper businessSystemMapper;
+    private OtherBusinessSystemMapper otherBusinessSystemMapper;;
 
     @Autowired
     private OfficeMapper officeMapper;
@@ -81,7 +82,7 @@ public class OfficeServiceImpl implements OfficeService {
     @Override
     @Transactional
     public Map<String, Object> deleteOffice(Integer id) {
-        Integer sysCount = businessSystemMapper.CountSystemByOffice(id);
+        Integer sysCount = otherBusinessSystemMapper.CountSystemByOffice(id);
         if(sysCount > 0){
             SendUtil.send(false);
         }

spring-cloud/server-basic/src/main/java/com/jd/service/impl/SystemRiskServiceImpl.java

@@ -26,7 +26,7 @@ import java.util.*;
 @Service("SystemRiskServiceImpl")
 public class SystemRiskServiceImpl implements SystemRiskService {
     @Autowired
-    private BusinessSystemMapper businessSystemMapper;
+    private OtherBusinessSystemMapper otherBusinessSystemMapper;
 
     @Autowired
     private SafetyInfoMapper safetyInfoMapper;
@@ -117,7 +117,7 @@ public class SystemRiskServiceImpl implements SystemRiskService {
                     Integer highRisk = Integer.parseInt(map.get("high_risk_number").toString());
                     Integer middleRisk = Integer.parseInt(map.get("middle_risk_number").toString());
                     String systemName = map.get("system_name").toString();
-                    Map<String, Object> businessSystem = businessSystemMapper.getOfficeBySysName(systemName);
+                    Map<String, Object> businessSystem = otherBusinessSystemMapper.getOfficeBySysName(systemName);
                     Integer officeType = 0;
                     if(Blank.isNotEmpty(businessSystem)){
                         if(Blank.isEmpty(businessSystem.get("office_type"))){
@@ -477,17 +477,23 @@ public class SystemRiskServiceImpl implements SystemRiskService {
         //修改
         Boolean result = systemRiskMapper.deleteSystemRiskInfo(systemRiskId);
         Map<String, Object> SUM = systemRiskMapper.SUMSystemRiskNumber(infoId);
-        if (Blank.isEmpty(SUM)) {
-            return SendUtil.send(false);
-        }
-        if(Blank.isEmpty(SUM.get("high_number")) || Blank.isEmpty(SUM.get("middle_number"))){
-            return SendUtil.send(false);
+        Integer highRiskNum = null;
+        Integer middleRiskNum = null;
+        if (Blank.isNotEmpty(SUM)) {
+            if(Blank.isEmpty(SUM.get("high_number")) || Blank.isEmpty(SUM.get("middle_number"))){
+                return SendUtil.send(false);
+            }
+            highRiskNum = Convert.toInt(SUM.get("high_number").toString());
+            middleRiskNum = Convert.toInt(SUM.get("middle_number").toString());
+        }else {
+            highRiskNum = 0;
+            middleRiskNum = 0;
         }
         //更新安全数据
         SafetyInfo safetyInfo = new SafetyInfo();
         safetyInfo.setId(infoId);
-        safetyInfo.setHighRiskNum(Convert.toInt(SUM.get("high_number").toString()));
-        safetyInfo.setMiddleRiskNum(Convert.toInt(SUM.get("middle_number").toString()));
+        safetyInfo.setHighRiskNum(highRiskNum);
+        safetyInfo.setMiddleRiskNum(middleRiskNum);
         safetyInfoMapper.updateSafetyInfo(safetyInfo);
         return SendUtil.send(result);
     }

spring-cloud/server-basic/src/main/resources/mapper/OtherBusinessSystemMapper.xml

@@ -10,22 +10,27 @@
     <!-- 分页查询其他业务系统 -->
     <select id="getOtherSystem" resultType="map" parameterType="map">
         SELECT
-        id,
-        system_name,
-        office_id,
-        org_type,
-        grade_eval,
-        eval_time,
-        create_time,
-        update_time
+        obs.id,
+        obs.system_name,
+        obs.office_id,
+        o.office_name,
+        obs.org_type,
+        ot.description,
+        obs.grade_eval,
+        obs.eval_time,
+        obs.create_time,
+        obs.update_time
         FROM
-        t_other_business_system
+        t_other_business_system obs
+        LEFT JOIN t_office o ON obs.office_id	= o.id
+        LEFT JOIN (SELECT * FROM t_basic_data WHERE data_key = 'ORG_TYPE') ot ON obs.org_type = ot.data_value
+
         <where>
             <if test="systemName != null and systemName != ''">
-                AND system_name = #{systemName}
+                AND obs.system_name = #{systemName}
             </if>
         </where>
-        ORDER BY create_time DESC
+        ORDER BY obs.create_time DESC
         LIMIT #{startRows}, #{limit}
     </select>
 
@@ -48,6 +53,24 @@
         </where>
     </select>
 
+    <select id="getOfficeBySysName" resultType="java.util.Map">
+        SELECT
+            bs.system_name,
+            o.office_type
+        from t_other_business_system bs
+                 LEFT JOIN t_office o ON bs.office_id = o.id
+        WHERE system_name = #{systemName}
+    </select>
+
+    <select id="CountSystemByOffice" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM
+            t_business_system
+        WHERE
+            office_id = #{officeId}
+    </select>
+
     <!-- 查询其他业务系统 -->
     <select id="getOtherSystemById" resultType="map" parameterType="map">
         SELECT

spring-cloud/server-page/src/main/resources/static/page/js/basic/otherBusinessSystemManager.js

@@ -34,10 +34,10 @@ layui.config({
                 field: 'system_name',
                 title: '系统名称',
             }, {
-                field: 'office_id',
+                field: 'office_name',
                 title: '所属单位'
             }, {
-                field: 'org_type',
+                field: 'description',
                 title: '所属板块'
             }, {
                 field: 'create_time',

spring-cloud/server-page/src/main/resources/static/page/js/basic/safetyInfoManager.js

@@ -235,6 +235,7 @@ function addModuleClassification() {
 					$("#AttackBlock").css("display", "");
 					$("#departmentBlock").css("display", "");
 					$('#submit').attr('submitType', 'update');
+					initBusinessSystemType($("#orgType").val());
 				}else {
 					layer.msg("新增安全信息成功！", {icon: 6});
 					$(".main").addClass("layui-show").removeClass("layui-hide");