fix外协单位 单位名称、单位地址、联系人名称模糊搜索

module_base/src/main/java/org/jeecg/modules/client/controller/ClientController.java

@@ -49,7 +49,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ClientController extends JeecgController<Client, IClientService> {
 	@Autowired
 	private IClientService clientService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -66,12 +66,17 @@ public class ClientController extends JeecgController<Client, IClientService> {
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<Client> queryWrapper = QueryGenerator.initQueryWrapper(client, req.getParameterMap());
+		Client client1 = new Client();
+		client1.setClientType(client.getClientType());
+		QueryWrapper<Client> queryWrapper = QueryGenerator.initQueryWrapper(client1, req.getParameterMap());
+		queryWrapper.like(client.getClientName()!=null && !client.getClientName().equals(""),"client_name", client.getClientName());
+		queryWrapper.like(client.getClientAddress()!=null && !client.getClientAddress().equals(""),"client_address", client.getClientAddress());
+		queryWrapper.like(client.getClientPerson()!=null && !client.getClientPerson().equals(""),"client_person", client.getClientPerson());
 		Page<Client> page = new Page<Client>(pageNo, pageSize);
 		IPage<Client> pageList = clientService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +91,7 @@ public class ClientController extends JeecgController<Client, IClientService> {
 		clientService.save(client);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +106,7 @@ public class ClientController extends JeecgController<Client, IClientService> {
 		clientService.updateById(client);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +121,7 @@ public class ClientController extends JeecgController<Client, IClientService> {
 		clientService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +136,7 @@ public class ClientController extends JeecgController<Client, IClientService> {
 		this.clientService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *