bugfix

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java

@@ -334,7 +334,7 @@ public class UnitController {
             wrapper1.eq("dwmc", userNames);
             wrapper1.eq("del_flag","0");
             List<AssetCurrent> list = assetCurrentService.list(wrapper1);
-            if(list!=null&&list.size()>0){
+            if(list!=null && !list.isEmpty()){
                 list.forEach(x->{
                     assetSupplyChainService.deleteByAssetIds(x.getId());
                     assetBasicNetworkService.deleteByAssetIds(x.getId());
@@ -352,6 +352,11 @@ public class UnitController {
                     QueryWrapper<UnitOtherConcatCpPo> queryWrapper5 = new QueryWrapper<>();
                     queryWrapper5.eq("asset_id", x.getId());
                     unitOtherConcatCpService.remove(queryWrapper5);
+
+                    assetCurrentService.deleteByUnitIds(x.getId());
+                    QueryWrapper<AssetCurrentCpPo> f1 = new QueryWrapper<>();
+                    queryWrapper5.eq("id", x.getId());
+                    assetCurrentCpService.remove(f1);
                 });
             }
             QueryWrapper<AssetApp> r1 = new QueryWrapper<>();

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java

@@ -170,35 +170,27 @@ public class Unit implements Serializable {
     private String dylxrzwzc;
 
     @ApiModelProperty("首席数据官")
-    @Excel(name="首席数据官")
     private String sxsjg;
 
     @ApiModelProperty("首席数据官联系方式")
-    @Excel(name="首席数据官联系方式")
     private String sxsjglxfs;
 
     @ApiModelProperty("首席数据官邮箱")
-    @Excel(name="首席数据官邮箱")
     private String sxsjgyx;
 
     @ApiModelProperty("首席数据官职务职称")
-    @Excel(name="首席数据官职务职称")
     private String sxsjgzwzc;
 
     @ApiModelProperty("数据官联络人")
-    @Excel(name="数据官联络人")
     private String sjgllr;
 
     @ApiModelProperty("数据官联络人联系方式")
-    @Excel(name="数据官联络人联系方式")
     private String sjgllrlxfs;
 
     @ApiModelProperty("数据官联络人邮箱")
-    @Excel(name="数据官联络人邮箱")
     private String sjgllryx;
 
     @ApiModelProperty("数据官联络人职务职称")
-    @Excel(name="数据官联络人职务职称")
     private String sjgllrzwzc;
 
 

ruoyi-admin/src/main/resources/application.yml

@@ -144,4 +144,4 @@ unitDockingContact: http://2.35.109.131:9193/outApiData/tcjczhapi/org_dm_dwlxrb_
 #系统基础信息
 systemInfo: http://2.35.109.131:9193/outApiData/tcjczhapi/org_dm_xtxgxxb_1505
 #系统等保信息
-systemDb: http://2.35.109.131:9193/outApiData/tcjczhapi/org_dm_xtdbxxb_4446
+systemDb: http://2.35.109.131:9193/outApiData/tcjczhapi/org_dm_xtdbxxb_4446

ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml

@@ -18,9 +18,9 @@
         select a.*,c.dept_name as deptName,e.audit_state  as auditState from asset_app a
             left join unit_info b on a.ssdw = b.nick_name
             left join sys_dept c on b.dept_id = c.dept_id
-            left join asset_app_cp e on a.id = e.asset_id
+            left join (select * from asset_app_cp where task_id is null) e on a.id = e.asset_id
         <where>
-            a.del_flag = '0' and e.task_id is null
+            a.del_flag = '0'
             <if test="req.yymc!=null and req.yymc!='' ">
                 and a.app_name like concat('%',#{req.yymc},'%')
             </if>

ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml

@@ -16,9 +16,9 @@
         select a.*,e.audit_state as auditState from asset_current a
         left join unit_info b on a.dwmc = b.nick_name
         left join sys_dept c on b.dept_id = c.dept_id
-        left join asset_current_cp e on a.id = e.id
+        left join (select * from asset_current_cp where task_id is null) e on a.id = e.id
         <where>
-           a. del_flag = '0' and e.task_id is null
+           a. del_flag = '0'
             <if test="req.xtmc!=null and req.xtmc!='' ">
                 and a.xtmc like concat('%',#{req.xtmc},'%')
             </if>

ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml

@@ -18,9 +18,9 @@
         select a.*,e.audit_state as auditState from asset_email a
         left join unit_info b on a.ssdw = b.nick_name
         left join sys_dept c on b.dept_id = c.dept_id
-        left join asset_email_cp e on a.id = e.asset_id
+        left join (select * from asset_email_cp where task_id is null) e on a.id = e.asset_id
         <where>
-            a.del_flag = '0' and e.task_id is null
+            a.del_flag = '0'
             <if test="req.dzyxhz!=null and req.dzyxhz!='' ">
                 and a.dzyxhz like concat('%',#{req.dzyxhz},'%')
             </if>

ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml

@@ -18,9 +18,9 @@
         select a.*,e.audit_state as auditState from asset_mini_programs a
         left join unit_info b on a.ssdw = b.nick_name
         left join sys_dept c on b.dept_id = c.dept_id
-        left join asset_mini_programs_cp e on a.id = e.asset_id
+        left join (select * from asset_mini_programs_cp where task_id is null)  e on a.id = e.asset_id
         <where>
-            a.del_flag = '0' and e.task_id is null
+            a.del_flag = '0'
             <if test="req.xcxmc!=null and req.xcxmc!='' ">
                 and a.xcxmc like concat('%',#{req.xcxmc},'%')
             </if>

ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml

@@ -22,9 +22,9 @@
         select a.*,e.audit_state as auditState from asset_official_account a
         left join unit_info b on a.ssdw = b.nick_name
         left join sys_dept c on b.dept_id = c.dept_id
-        left join asset_official_account_cp e on a.id = e.asset_id
+        left join (select * from asset_official_account_cp where task_id is null) e on a.id = e.asset_id
         <where>
-            a.del_flag = '0' and e.task_id is null
+            a.del_flag = '0'
             <if test="req.gzhmc!=null and req.gzhmc!='' ">
                 and a.gzhmc like concat('%',#{req.gzhmc},'%')
             </if>

ruoyi-admin/src/main/resources/mapper/UnitMapper.xml

@@ -133,7 +133,7 @@
 
 
     <select id="selectByIds" resultType="java.lang.String">
-        select user_name
+        select nick_name
         from unit_info
         where id = #{id} and del_flag= '0'
     </select>
@@ -401,14 +401,12 @@
     </select>
 
 
-    <update id="deleteUnits">
-        update unit_info
-        set del_flag = '2'
+    <delete id="deleteUnits">
+        delete from unit_info
         where id = #{id}
-    </update>
-    <update id="deleteUsers">
-        update sys_user
-        set del_flag = '2'
+    </delete>
+    <delete id="deleteUsers">
+        delete from sys_user
         where user_name = #{userNames}
-    </update>
+    </delete>
 </mapper>