item：【JCS】bug修改提交

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -427,14 +427,16 @@ public class WaterResourceController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
     public ResponseModel<Page<WaterResourceDto>> queryForPage(@RequestParam(value = "pageNum") int pageNum,
-                                                              @RequestParam(value = "pageSize") int pageSize, String name,
+                                                              @RequestParam(value = "pageSize") int pageSize,
+                                                              @RequestParam(value = "name", required = false) String name,
                                                               @RequestParam(value = "belongBuildingId", required = false) ArrayList<Long> belongBuildingId,
-                                                              Long belongFightingSystemId, Long sequenceNbr,
-                                                              String resourceType,
-                                                              String classifyId,
-                                                              String bizOrgCode,
-                                                              String equipCateGoryCode,
-                                                              List<String> ids) {
+                                                              @RequestParam(value = "belongFightingSystemId", required = false) Long belongFightingSystemId,
+                                                              @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr,
+                                                              @RequestParam(value = "resourceType", required = false) String resourceType,
+                                                              @RequestParam(value = "classifyId", required = false) String classifyId,
+                                                              @RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
+                                                              @RequestParam(value = "equipCateGoryCode", required = false) String equipCateGoryCode,
+                                                              @RequestParam(value = "ids", required = false) List<String> ids) {
         Page<WaterResourceDto> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -1745,11 +1745,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		if (StringUtils.isNotEmpty(type) && type.equals("COMPANY")){
 			//查询当前登录人所属单位/部门
 			OrgUsr orgUsr = orgUsrMapper.selectById(reginParams.getPersonIdentity().getCompanyId());
-			//判断登陆人是否已经是顶级节点单位
-			if (orgUsr.getParentId() != null ){
-				orgUsr  =this.selectParentOrgUsr(orgUsr);
-				bizOrgCode = orgUsr.getBizOrgCode() != null? orgUsr.getBizOrgCode() : reginParams.getPersonIdentity().getBizOrgCode();
+			if (!ObjectUtils.isEmpty(orgUsr)) {
+				//判断登陆人是否已经是顶级节点单位
+				if (orgUsr.getParentId() != null ){
+					orgUsr  =this.selectParentOrgUsr(orgUsr);
+					bizOrgCode = orgUsr.getBizOrgCode() != null? orgUsr.getBizOrgCode() : reginParams.getPersonIdentity().getBizOrgCode();
 
+				}
 			}
 		}
 		param.put("bizOrgCode", bizOrgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IAreaService.java

@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.dto.AreaDto;
 import com.yeejoin.equipmanage.common.entity.Area;
 import com.yeejoin.equipmanage.common.vo.AreaResquest;
-import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
 import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 
 import java.util.List;

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2795,25 +2795,24 @@
     </changeSet>
 
 
-    <changeSet author="tw" id="20220217-2"  runAlways="true">
+    <changeSet author="gaojianqiang" id="202206301726-1"  runAlways="true">
         <comment>`getChildLstCode`</comment>
         <sql endDelimiter="#">
             DROP FUNCTION IF EXISTS `getChildLstCode`#
-            CREATE DEFINER=`root`@`%` FUNCTION `getChildLstCode`(rootId varchar(100)) RETURNS varchar(2000) CHARSET latin1
+            CREATE DEFINER=`root`@`%` FUNCTION `getChildLstCode`(`rootId` bigint) RETURNS varchar(1000) CHARSET utf8
             BEGIN
-            DECLARE i varchar(2000) default '';
-            DECLARE j varchar(1000) default rootId;
 
-            WHILE rootId is not null  do
-            SET i =(SELECT group_concat(sequence_nbr) FROM cb_data_dictionary WHERE  parent in ( rootId) );
-            IF i is not null THEN
-            SET j = concat(i, ',', j);
-            SET rootId = i;
-            ELSE
-            SET rootId = i;
-            END IF;
+            DECLARE sTemp TEXT;
+            DECLARE sTempChd VARCHAR(4000);
+
+            SET sTemp='$';
+            SET sTempChd = CAST(rootId AS CHAR);
+
+            WHILE sTempChd IS NOT NULL DO
+            SET sTemp= CONCAT(sTemp,',',sTempChd);
+            SELECT GROUP_CONCAT(distinct sequence_nbr) INTO sTempChd FROM cb_data_dictionary WHERE FIND_IN_SET(parent,sTempChd)>0;
             END WHILE;
-            return j;
+            RETURN substring(sTemp,3);
             END#
         </sql>
     </changeSet>