修复bug

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java

@@ -163,14 +163,14 @@ public class ContractInfoController extends BladeController {
         if (wbsTreeContracts.size() > 0) {
             return R.fail("合同段存在关联的WBS树,删除失败");
         }
-        List<SaveUserInfoByProjectDTO> list = saveUserInfoByProjectMapper.selectList(Wrappers.<SaveUserInfoByProjectDTO>query().lambda()
+        Long list = saveUserInfoByProjectMapper.selectCount(Wrappers.<SaveUserInfoByProjectDTO>query().lambda()
                 .eq(SaveUserInfoByProjectDTO::getContractId, ids)
         );
-        if (list.size() > 0) {
+        if (list > 0L) {
             return R.fail("当前合同段存在关联用户,删除失败");
         }
-        List<ContractRelationJlyz> list2 = saveUserInfoByProjectMapper.selectSGJL(ids);
-        if (list2.size() > 0) {
+        Integer list2 = saveUserInfoByProjectMapper.selectSGJL(ids);
+        if (list2 > 0) {
             return R.fail("当前监理合同段存在关联的施工合同信息,删除失败");
         }
         return R.status(contractInfoService.deleteLogic(Func.toLongList(ids)));

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsInfoController.java

@@ -13,6 +13,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.dto.WbsInfoDTO;
 import org.springblade.manager.entity.WbsInfo;
+import org.springblade.manager.entity.WbsTree;
 import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.IWbsTreeService;
@@ -43,7 +44,7 @@ public class WbsInfoController extends BladeController {
     @GetMapping("/queryLogTree")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "获取日志类型划分模板")
-    public R<List<WbsInfo>> queryLogTree(){
+    public R<List<WbsInfo>> queryLogTree() {
         return R.data(this.wbsInfoService.list(Wrappers.<WbsInfo>lambdaQuery().eq(WbsInfo::getWbsType, 4)));
     }
 
@@ -135,12 +136,12 @@ public class WbsInfoController extends BladeController {
         if (list.size() > 0) {
             return R.fail("当前模板根节点下有子节点,删除失败");
         }*/
-        List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query()
+        Long wbsTreePrivates = wbsTreePrivateMapper.selectCount(Wrappers.<WbsTreePrivate>query()
                 .lambda()
                 .eq(WbsTreePrivate::getWbsId, ids)
                 .eq(WbsTreePrivate::getStatus, 1)
                 .eq(WbsTreePrivate::getIsDeleted, 0));
-        if (wbsTreePrivates.size() > 0) {
+        if (wbsTreePrivates > 0L) {
             return R.fail("当前模板已被项目引用,删除失败");
         }
         boolean b = wbsInfoService.deleteLogic(Func.toLongList(ids));

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -138,11 +138,11 @@ public class WbsTreeController extends BladeController {
         if (wbsTreeList.size() > 0) {
             throw new ServiceException("当前节点下存在子节点或表单，删除失败");
         }*/
-        List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
+        Long wbsTreePrivates = wbsTreePrivateMapper.selectCount(Wrappers.<WbsTreePrivate>query().lambda()
                 .eq(WbsTreePrivate::getStatus, 1)
                 .eq(WbsTreePrivate::getId, id)
         );
-        if (wbsTreePrivates.size() > 0) {
+        if (wbsTreePrivates > 0L) {
             throw new ServiceException("当前节点已被项目引用，删除失败");
         }
         return R.status(wbsTreeService.deleteLogicById(id));
@@ -172,14 +172,14 @@ public class WbsTreeController extends BladeController {
     @ApiImplicitParam(name = "id", value = "表单id", required = true)
     public R removeTableById(@RequestParam("id") String id) {
         if (StringUtils.isNotEmpty(id)) {
-            /*List<WbsFormElementVO> wbsFormElements = wbsTreeService.selectFormElements(id);
+            List<WbsFormElementVO> wbsFormElements = wbsTreeService.selectFormElements(id);
             if (wbsFormElements.size() > 0) {
                 throw new ServiceException("该表单中存在元素，删除失败");
-            }*/
-            /*List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
+            }
+            /*Long wbsTreePrivates = wbsTreePrivateMapper.selectCount(Wrappers.<WbsTreePrivate>query().lambda()
                     .eq(WbsTreePrivate::getStatus, 1)
                     .eq(WbsTreePrivate::getId, id));
-            if (wbsTreePrivates.size() > 0) {
+            if (wbsTreePrivates > 0L) {
                 throw new ServiceException("该表单已被项目引用，删除失败");
             }*/
             if (wbsTreeService.removeTableById(id)) {
@@ -345,8 +345,8 @@ public class WbsTreeController extends BladeController {
     @ApiOperationSupport(order = 19)
     @ApiOperation(value = "新增或修改节点别名", notes = "传入节点id、fullNames")
     @RequestMapping(value = "/submit-full-name", method = RequestMethod.POST)
-    public R submitFullName(@RequestParam String id,@RequestParam String fullNames) {
-        return R.status(wbsTreeService.submitFullName(id,fullNames));
+    public R submitFullName(@RequestParam String id, @RequestParam String fullNames) {
+        return R.status(wbsTreeService.submitFullName(id, fullNames));
     }
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreePrivateController.java

@@ -192,21 +192,21 @@ public class WbsTreePrivateController extends BladeController {
         WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.selectOne(Wrappers.<WbsTreePrivate>query().lambda()
                 .eq(WbsTreePrivate::getPKeyId, pKeyId)
                 .eq(WbsTreePrivate::getStatus, 1));
-        /*List<WbsTreePrivate> wbsTreePrivate1 = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
+        /*Long wbsTreePrivate1 = wbsTreePrivateMapper.selectCount(Wrappers.<WbsTreePrivate>query().lambda()
                 .eq(WbsTreePrivate::getParentId, wbsTreePrivate.getId())
                 .eq(WbsTreePrivate::getProjectId, wbsTreePrivate.getProjectId())
                 .eq(WbsTreePrivate::getWbsId, wbsTreePrivate.getWbsId())
                 .eq(WbsTreePrivate::getStatus, 1));
-        if (wbsTreePrivate1.size() > 0) {
+        if (wbsTreePrivate1 > 0L) {
             throw new ServiceException("当前节点下存在子节点或表单，删除失败");
         }*/
-        List<WbsTreeContract> wbsTreeContracts = wbsTreeContractMapper.selectList(Wrappers.<WbsTreeContract>query().lambda()
+        Long wbsTreeContracts = wbsTreeContractMapper.selectCount(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getStatus, 1)
                 .eq(WbsTreeContract::getId, wbsTreePrivate.getId())
                 .eq(WbsTreeContract::getProjectId, wbsTreePrivate.getProjectId())
                 .eq(WbsTreeContract::getWbsId, wbsTreePrivate.getWbsId())
         );
-        if (wbsTreeContracts.size() > 0) {
+        if (wbsTreeContracts > 0L) {
             throw new ServiceException("当前节点已被合同段引用中，删除失败");
         }
         if (wbsTreePrivateService.deleteLogicBypKeyId(pKeyId) > 0) {
@@ -256,12 +256,12 @@ public class WbsTreePrivateController extends BladeController {
     public R removeTableByCondition(@RequestParam("id") String id,
                                     @RequestParam("wbsId") String wbsId,
                                     @RequestParam("projectId") String projectId) {
-        List<WbsTreeContract> wbsTreeContracts = wbsTreeContractMapper.selectList(Wrappers.<WbsTreeContract>query().lambda()
+        Long wbsTreeContracts = wbsTreeContractMapper.selectCount(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getProjectId, projectId)
                 .eq(WbsTreeContract::getWbsId, wbsId)
                 .eq(WbsTreeContract::getId, id)
         );
-        if (wbsTreeContracts.size() > 0) {
+        if (wbsTreeContracts > 0L) {
             throw new ServiceException("当前表单被合同段引用中，删除失败");
         }
         boolean result = wbsTreePrivateService.removeTableByCondition(id, wbsId, projectId);
@@ -385,8 +385,8 @@ public class WbsTreePrivateController extends BladeController {
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "新增或修改节点别名", notes = "传入节点pKeyId、fullNames")
     @RequestMapping(value = "/submit-full-name", method = RequestMethod.POST)
-    public R submitFullName(@RequestParam String pKeyId,@RequestParam String fullNames) {
-        return R.status(wbsTreePrivateService.submitFullName(pKeyId,fullNames));
+    public R submitFullName(@RequestParam String pKeyId, @RequestParam String fullNames) {
+        return R.status(wbsTreePrivateService.submitFullName(pKeyId, fullNames));
     }
 
     /**

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/SaveUserInfoByProjectMapper.java

@@ -26,6 +26,6 @@ public interface SaveUserInfoByProjectMapper extends BaseMapper<SaveUserInfoByPr
 
     int deleteByIdsPhysical(@Param("idsList") List<Long> idsList);
 
-    List<ContractRelationJlyz> selectSGJL(String ids);
+    Integer selectSGJL(String ids);
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/SaveUserInfoByProjectMapper.xml

@@ -102,8 +102,8 @@
         </foreach>
     </select>
 
-    <select id="selectSGJL" resultType="org.springblade.manager.entity.ContractRelationJlyz">
-        select count(1) from m_contract_relation_jlyz where contract_id_jlyz = #{ids}
+    <select id="selectSGJL" resultType="java.lang.Integer">
+        select count(*) from m_contract_relation_jlyz where contract_id_jlyz = #{ids}
     </select>
 
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsFormElementMapper.xml

@@ -108,7 +108,7 @@
         where is_deleted = 0
     </select>
     <select id="judgeFiled" resultType="Integer">
-        select count(1)
+        select count(*)
         from information_schema.columns
         where table_name = &quot;${tableName}&quot;
           and column_name = &quot;${eKey}&quot;
@@ -154,7 +154,7 @@
     </select>
 
     <select id="assertFiledExist" resultType="java.lang.Integer">
-        SELECT count(1) FROM ${initTableName} WHERE ${eKey} is not null
+        SELECT count(*) FROM ${initTableName} WHERE ${eKey} is not null
     </select>
 
     <select id="selectFiledType" resultType="java.lang.String">

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -323,7 +323,7 @@
             wt.parent_id AS "parentId",
             wt.wbs_id AS "wbsId",
             wt.fill_rate AS "fillRate",
-            (SELECT count(1) FROM m_wbs_form_element WHERE f_id = wt.id and is_deleted = 0 and status = 1) AS "elementTotal"
+            (SELECT count(*) FROM m_wbs_form_element WHERE f_id = wt.id and is_deleted = 0 and status = 1) AS "elementTotal"
         FROM
             m_wbs_tree AS wt
         WHERE
@@ -346,7 +346,7 @@
             wt.init_table_name as "initTableName",
             wt.parent_id AS "parentId",
             wt.wbs_id AS "wbsId",
-            (SELECT count(1) FROM m_wbs_form_element AS wfe WHERE wfe.f_id=wt.id and wfe.is_deleted = 0) AS elementTotal
+            (SELECT count(*) FROM m_wbs_form_element AS wfe WHERE wfe.f_id=wt.id and wfe.is_deleted = 0) AS elementTotal
         FROM
             m_wbs_tree_private AS wt
         WHERE
@@ -358,7 +358,7 @@
     </select>
 
     <select id="selectByElementsTotal" resultType="java.lang.String">
-        SELECT f_id,count(1) as elementTotal FROM m_wbs_form_element where f_id in #{ids} and is_deleted=0 GROUP BY f_id
+        SELECT f_id,count(*) as elementTotal FROM m_wbs_form_element where f_id in #{ids} and is_deleted=0 GROUP BY f_id
     </select>
 
 
@@ -373,7 +373,7 @@
             is_deleted = 0 and f_id = #{id}
     </select>
     <select id="selectRepeatByProjectId" resultType="java.lang.Integer">
-        SELECT COUNT(1) FROM m_wbs_tree_private WHERE project_id = #{projectId} AND status = 1 AND is_deleted = 0
+        SELECT COUNT(*) FROM m_wbs_tree_private WHERE project_id = #{projectId} AND status = 1 AND is_deleted = 0
     </select>
 
     <select id="findAllNodeTableList" resultType="org.springblade.manager.entity.WbsTree">

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -519,7 +519,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                     }
                 }
 
-                //去重
+                //判断是否存在
                 Iterator<WbsParam> iterator = paramListData.iterator();
                 while (iterator.hasNext()) {
                     WbsParam next = iterator.next();