修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -71,12 +71,15 @@
                                         <if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
                                             AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
                                         </if>
-                                        <if test="map.amosOrgId != null and map.amosOrgId != '-1'">
-             								   AND u.amos_org_id like concat(#{map.amosOrgId}, '%')
+                                        <if test="map.amosOrgCode != null and map.amosOrgCode != ''">
+             								   AND u.amos_org_code like concat('%', #{map.amosOrgCode}, '%')
           								 </if>
                                         <if test="map.company != null and map.company != '-1'">
                                         AND u.parent_id = #{map.company}
                                         </if>
+                                        <if test="map.positionType != null and map.positionType != ''">
+                                            AND FIND_IN_SET(#{map.positionType},g.positionType)
+                                        </if>
                                         GROUP BY
                                         u.sequence_nbr ,
                                         u.biz_org_name ,
@@ -145,14 +148,14 @@
             <if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
                 AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
             </if>
-            <if test="map.amosOrgCode != null and map.amosOrgCode != '-1'">
+            <if test="map.amosOrgCode != null and map.amosOrgCode != ''">
                 AND u.amos_org_code like concat('%',#{map.amosOrgCode}, '%')
             </if>
             <if test="map.company != null and map.company != '-1'">
             AND u.parent_id = #{map.company}
             </if>
             <if test="map.positionType != null and map.positionType != ''">
-                AND AND FIND_IN_SET(#{positionType},g.positionType)
+            AND FIND_IN_SET(#{map.positionType},g.positionType)
             </if>
             GROUP BY
             u.sequence_nbr ,

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

@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonShiftDto;
 import com.yeejoin.amos.boot.module.common.api.mapper.DutyPersonShiftMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 

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

@@ -596,6 +596,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		String positionType = "";
 		if(req.containsKey("positionType")) {
 			positionType = req.get("positionType").toString();
+			map.put("positionType", positionType);
 		}
 
 		req.remove("pageSize");
@@ -604,6 +605,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		req.remove("amosOrgId");
 		req.remove("company");
 		req.remove("positionType");
+		req.remove("bizOrgName");
 		map.put("fieldsValue", req);
 		map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
 		pageBean.setTotal(this.baseMapper.selectPersonListCount(map));
@@ -651,7 +653,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		if(!positionType.equals("")) {
 			String positionTypeFine = positionType;
-			list = list.stream().filter(e-> String.valueOf(e.get("positionType")).equals(positionTypeFine)).collect(Collectors.toList());
+			list = list.stream().filter(e-> !ObjectUtils.isEmpty(e.get("positionType")) && String.valueOf(e.get("positionType")).contains(positionTypeFine)).collect(Collectors.toList());
 		}
 		/* Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 结束 */
 		pageBean.setRecords(list);

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -262,4 +262,15 @@
                 MODIFY COLUMN `level_device_name` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水池液位显示装置名称';
         </sql>
     </changeSet>
+    <changeSet author="keyong" id="202210131721-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="wl_form_group"/>
+        </preConditions>
+        <comment>添加特殊设备字段</comment>
+        <sql>
+            REPLACE INTO `wl_form_group`(`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674825, 'CAFS泡沫罐', '92031900', 'equip', 'edit,delete', 2581805, '2022-10-09 03:36:43');
+            REPLACE INTO `wl_form_group`(`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674826, '管网压力探测器', '92011000', 'equip', 'edit,delete', 2581805, '2022-10-09 03:36:44');
+            REPLACE INTO `wl_form_group`(`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674827, '消防水池装置', '92010700', 'equip', 'edit,delete', 2581805, '2022-10-09 03:36:44');
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file