Merge branch 'duhanyu' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into dongdingding

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

@@ -17,9 +17,7 @@ import com.ruoyi.tc.entity.request.Acomma;
 import com.ruoyi.tc.entity.request.AssetAppPageRequest;
 import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import com.ruoyi.tc.entity.request.AssetAuditRequest;
-import com.ruoyi.tc.service.AssetAppCpService;
-import com.ruoyi.tc.service.AssetAppJyService;
-import com.ruoyi.tc.service.AssetAppService;
+import com.ruoyi.tc.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -96,12 +94,6 @@ public class AssetAppController extends BaseController {
             throw new ServiceException("请选择已有单位!");
         }
 
-        List<AssetApp> list1 = assetAppService.lambdaQuery().eq(AssetApp::getSsdw, assetAppJyPo.getSsdw())
-                .eq(AssetApp::getAppName, assetAppJyPo.getAppName()).list();
-        if (list1 != null&& !list1.isEmpty()){
-            throw new ServiceException("不允许新增重复资产!");
-        }
-
 
         AssetAppJyPo one = assetAppJyService.lambdaQuery().eq(AssetAppJyPo::getAppName,assetAppJyPo.getAppName())
                 .eq(AssetAppJyPo::getSsdw,assetAppJyPo.getSsdw()).isNull(AssetAppJyPo::getTaskId).one();

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

@@ -262,12 +262,6 @@ public class AssetCurrentController extends BaseController {
             throw new ServiceException("请选择已有单位!");
         }
 
-        List<AssetCurrent> list1 = assetCurrentService.lambdaQuery().eq(AssetCurrent::getXtmc, assetCurrentJyPo.getXtmc()).eq(AssetCurrent::getDwmc, assetCurrentJyPo.getDwmc()).list();
-        if (list1 != null&& !list1.isEmpty()){
-            throw new ServiceException("不允许新增重复资产!");
-        }
-
-
         AssetCurrentJyPo one = assetCurrentJyService.lambdaQuery().eq(AssetCurrentJyPo::getXtmc, assetCurrentJyPo.getXtmc()).eq(AssetCurrentJyPo::getDwmc, assetCurrentJyPo.getDwmc()).isNull(AssetCurrentJyPo::getTaskId).one();
         assetCurrentJyPo.setAuditState("1");
         assetCurrentJyPo.setAuditYy(null);
@@ -541,11 +535,6 @@ public class AssetCurrentController extends BaseController {
         if (list == null || list.isEmpty()) {
             throw new ServiceException("请选择已有单位!");
         }
-
-        List<AssetCurrent> list3 = assetCurrentService.lambdaQuery().eq(AssetCurrent::getXtmc, assetCurrent.getXtmc()).eq(AssetCurrent::getDwmc, assetCurrent.getDwmc()).list();
-        if (list3 != null&& !list3.isEmpty()){
-            throw new ServiceException("不允许新增重复资产!");
-        }
         //保存未修改之前的单位名称
 //        AssetCurrent byId = assetCurrentService.getById(assetCurrent.getId());
         StringBuilder a = new StringBuilder();

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

@@ -96,11 +96,7 @@ public class AssetEmailController extends BaseController {
             throw new ServiceException("请选择已有单位!");
         }
 
-        List<AssetEmail> list1 = assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw, assetEmailJyPo.getSsdw())
-                .eq(AssetEmail::getDzyxhz, assetEmailJyPo.getDzyxhz()).list();
-        if (list1 != null&& !list1.isEmpty()){
-            throw new ServiceException("不允许新增重复资产!");
-        }
+
 
         AssetEmailJyPo one = assetEmailJyService.lambdaQuery().eq(AssetEmailJyPo::getSsdw,assetEmailJyPo.getSsdw())
                 .eq(AssetEmailJyPo::getDzyxhz,assetEmailJyPo.getDzyxhz()).isNull(AssetEmailJyPo::getTaskId).one();

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

@@ -101,11 +101,7 @@ public class AssetMiniProgramsController extends BaseController {
             throw new ServiceException("请选择已有单位!");
         }
 
-        List<AssetMiniPrograms> list1 = assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, assetMiniProgramsJyPo.getSsdw())
-                .eq(AssetMiniPrograms::getXcxmc, assetMiniProgramsJyPo.getXcxmc()).list();
-        if (list1 != null&& !list1.isEmpty()){
-            throw new ServiceException("不允许新增重复资产!");
-        }
+
 
 
         AssetMiniProgramsJyPo one = assetMiniProgramsJyService.lambdaQuery().eq(AssetMiniProgramsJyPo::getSsdw,assetMiniProgramsJyPo.getSsdw())

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

@@ -136,11 +136,7 @@ public class AssetOfficialAccountController {
             throw new ServiceException("请选择已有单位!");
         }
 
-        List<AssetOfficialAccount> list1 = assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, ao.getSsdw())
-                .eq(AssetOfficialAccount::getGzhmc, ao.getGzhmc()).list();
-        if (list1 != null&& !list1.isEmpty()){
-            throw new ServiceException("不允许新增重复资产!");
-        }
+
 
 
         if (ao.getCdList() != null && !ao.getCdList().isEmpty()) {

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java

@@ -132,11 +132,7 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
             throw new ServiceException("请选择已有单位!");
         }
 
-        List<AssetApp> list1 = lambdaQuery().eq(AssetApp::getSsdw, assetApp.getSsdw())
-                .eq(AssetApp::getAppName, assetApp.getAppName()).list();
-        if (list1 != null&& !list1.isEmpty()){
-            throw new ServiceException("不允许新增重复资产!");
-        }
+
         updateById(assetApp);
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailServiceImpl.java

@@ -131,11 +131,7 @@ public class AssetEmailServiceImpl extends ServiceImpl<AssetEmailMapper, AssetEm
         if (list1 == null || list1.isEmpty()) {
             throw new ServiceException("请选择已有单位!");
         }
-        List<AssetEmail> list3 = lambdaQuery().eq(AssetEmail::getSsdw, assetEmail.getSsdw())
-                .eq(AssetEmail::getDzyxhz, assetEmail.getDzyxhz()).list();
-        if (list3 != null&& !list3.isEmpty()){
-            throw new ServiceException("不允许新增重复资产!");
-        }
+
         updateById(assetEmail);
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsServiceImpl.java

@@ -121,11 +121,7 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
             throw new ServiceException("请选择已有单位!");
         }
 
-        List<AssetMiniPrograms> list1 = lambdaQuery().eq(AssetMiniPrograms::getSsdw, assetMiniPrograms.getSsdw())
-                .eq(AssetMiniPrograms::getXcxmc, assetMiniPrograms.getXcxmc()).list();
-        if (list1 != null&& !list1.isEmpty()){
-            throw new ServiceException("不允许新增重复资产!");
-        }
+
 
         updateById(assetMiniPrograms);
         List<AssetMiniProgramsCpPo> list = assetMiniProgramsCpService.lambdaQuery()

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountServiceImpl.java

@@ -151,11 +151,7 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
             throw new ServiceException("请选择已有单位!");
         }
 
-        List<AssetOfficialAccount> list4 = lambdaQuery().eq(AssetOfficialAccount::getSsdw, assetOfficialAccount.getSsdw())
-                .eq(AssetOfficialAccount::getGzhmc, assetOfficialAccount.getGzhmc()).list();
-        if (list4 != null&& !list4.isEmpty()){
-            throw new ServiceException("不允许新增重复资产!");
-        }
+
 
 
         if (assetOfficialAccount.getCdList() != null && !assetOfficialAccount.getCdList().isEmpty()) {