From 3a7619eec7810091ac7df48d7a2522da9a6c5fef Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Thu, 26 Dec 2024 17:02:39 +0800 Subject: [PATCH] bugfix --- .../com/ruoyi/tc/controller/UnitController.java | 7 ++++++- .../src/main/java/com/ruoyi/tc/entity/Unit.java | 8 -------- ruoyi-admin/src/main/resources/application.yml | 2 +- .../src/main/resources/mapper/AssetAppMapper.xml | 4 ++-- .../main/resources/mapper/AssetCurrentMapper.xml | 4 ++-- .../main/resources/mapper/AssetEmailMapper.xml | 4 ++-- .../resources/mapper/AssetMiniProgramsMapper.xml | 4 ++-- .../mapper/AssetOfficialAccountMapper.xml | 4 ++-- .../src/main/resources/mapper/UnitMapper.xml | 16 +++++++--------- 9 files changed, 24 insertions(+), 29 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java index 08c7938..97f15d4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java +++ b/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 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 queryWrapper5 = new QueryWrapper<>(); queryWrapper5.eq("asset_id", x.getId()); unitOtherConcatCpService.remove(queryWrapper5); + + assetCurrentService.deleteByUnitIds(x.getId()); + QueryWrapper f1 = new QueryWrapper<>(); + queryWrapper5.eq("id", x.getId()); + assetCurrentCpService.remove(f1); }); } QueryWrapper r1 = new QueryWrapper<>(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java index 1b99dca..10cf782 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java +++ b/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; diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 826969c..38848e0 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/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 \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml index 17056f9..25f0148 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml +++ b/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 - a.del_flag = '0' and e.task_id is null + a.del_flag = '0' and a.app_name like concat('%',#{req.yymc},'%') diff --git a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml index e36e978..0cffc39 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml +++ b/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 - a. del_flag = '0' and e.task_id is null + a. del_flag = '0' and a.xtmc like concat('%',#{req.xtmc},'%') diff --git a/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml index 74cec67..c42cfb9 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml +++ b/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 - a.del_flag = '0' and e.task_id is null + a.del_flag = '0' and a.dzyxhz like concat('%',#{req.dzyxhz},'%') diff --git a/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml index 03df5f9..a79e33d 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml +++ b/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 - a.del_flag = '0' and e.task_id is null + a.del_flag = '0' and a.xcxmc like concat('%',#{req.xcxmc},'%') diff --git a/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml index 054075e..9797c27 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml +++ b/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 - a.del_flag = '0' and e.task_id is null + a.del_flag = '0' and a.gzhmc like concat('%',#{req.gzhmc},'%') diff --git a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml index 2e1b206..216deeb 100644 --- a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml @@ -133,7 +133,7 @@ @@ -401,14 +401,12 @@ - - update unit_info - set del_flag = '2' + + delete from unit_info where id = #{id} - - - update sys_user - set del_flag = '2' + + + delete from sys_user where user_name = #{userNames} - + \ No newline at end of file