刪除多餘的条件判断，以及对其他方法的影响

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/ILinkageUnitService.java

@@ -2,16 +2,12 @@ package com.yeejoin.amos.boot.module.common.api.service;
 
 import java.util.List;
 
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
 
 /**
  * 联动单位接口类
@@ -37,18 +33,16 @@ public interface ILinkageUnitService {
 	 * @param emergencyLinkageUnitCode 紧急联动单位类型code
 	 * @return
 	 */
-	Page<LinkageUnitDto> queryForLinkageUnitPage(IPage<LinkageUnitDto> page,
-            @Condition(Operator.eq) Boolean isDelete,
-            @Condition(Operator.like) String unitName,
-            String linkageUnitTypeCode,
-            @Condition(Operator.eq) String linkageUnitType,
-            @Condition(Operator.eq) String emergencyLinkageUnitCode, 
-            String inAgreement);
+	Page<LinkageUnitDto> queryForLinkageUnitPage(IPage<LinkageUnitDto> page, Boolean isDelete, String unitName,
+			String linkageUnitTypeCode, String linkageUnitType, String emergencyLinkageUnitCode, String inAgreement);
+
 	/**
 	 * 获取当前存在的联动单位的类型组code
+	 * 
 	 * @return
 	 */
-	public  List<Menu> getEmergencyLinkageUnitCodeGroupBy(String type, String rootName) ;
+	public List<Menu> getEmergencyLinkageUnitCodeGroupBy(String type, String rootName);
+
 	List<LinkageUnitDto> exportToExcel();
 
 	List<LinkageUnitDto> queryForLinkageUnitList(Boolean isDelete);

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -541,12 +541,12 @@ public class CommandController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
     public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoQueryForPage(@RequestParam(value = "pageNum") int pageNum,
                                                             @RequestParam(value = "pageSize") int pageSize,
-                                                            String unitName, String linkageUnitType, String inAgreement) {
+                                                            String unitName,String linkageUnitTypeCode, String linkageUnitType, String inAgreement) {
         Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
         Page<LinkageUnitDto> linkageUnitDtoPage = iLinkageUnitService.queryForLinkageUnitPage(page, false,
-                unitName, linkageUnitType, null, inAgreement);
+                unitName,linkageUnitTypeCode, linkageUnitType, null, inAgreement);
 
         return ResponseHelper.buildResponse(linkageUnitDtoPage);
     }

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

@@ -74,9 +74,9 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 	 */
 	@Override
 	public Page<LinkageUnitDto> queryForLinkageUnitPage(IPage<LinkageUnitDto> page,
-			@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String unitName,
+			 Boolean isDelete, String unitName,
 			String linkageUnitTypeCode,
-			@Condition(Operator.eq) String linkageUnitType, @Condition(Operator.eq) String emergencyLinkageUnitCode,
+			 String linkageUnitType,  String emergencyLinkageUnitCode,
 			String inAgreement) {
 		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitType,linkageUnitTypeCode, emergencyLinkageUnitCode);
 		List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()), Map.class);

[陈浩]

提交联动单位的筛选查询修改