Browse Source

查询BUG修改

anderx 3 years ago
parent
commit
708c805af9

+ 12 - 12
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -183,9 +183,9 @@ public class AdminApiController extends CertifyApiController {
 	private CopyrightInfoService			copyrightInfoService;
 	@Resource
 	private OrgCognizanceProportionService	orgCognizanceProportionService;
-	
-	
-	
+
+
+
 	@Value(value = "${wx.appId}")
 	private String appId;
 	@Value(value = "${wx.appSecret}")
@@ -343,7 +343,7 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
-	
+
 
 	/**
 	 * 新增用户
@@ -726,7 +726,7 @@ public class AdminApiController extends CertifyApiController {
 
 	/**
 	 * 删除团体人力资源
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteHumanResource", method = RequestMethod.POST)
@@ -1568,7 +1568,7 @@ public class AdminApiController extends CertifyApiController {
 
 	/**
 	 * 删除企业年度研究开发费用结构明细记录
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
@@ -2619,8 +2619,8 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(disposeCognizanceStatus());
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * 高企认定流转状态
 	 */
@@ -2991,7 +2991,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 角色列表
 	 */
@@ -3032,9 +3032,9 @@ public class AdminApiController extends CertifyApiController {
 	 * 常用联系人列表
 	 */
 	@RequestMapping(value = "/frequentContactsList", method = RequestMethod.GET)
-	public Result frequentContactsList(String departmentId,String name,String roleName,Integer pageSize,Integer pageNo) {
+	public Result frequentContactsList(String deps,String name,String roleName,Integer pageSize,Integer pageNo) {
 		Result res = new Result();
-		res.setData(adminService.frequentContactsList(departmentId, name,roleName, pageSize, pageNo));
+		res.setData(adminService.frequentContactsList(deps, name,roleName, pageSize, pageNo));
 		return res;
 	}
 	/**
@@ -3069,5 +3069,5 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 }

+ 1 - 1
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -76,7 +76,7 @@ public interface AdminService {
 
 	int addFrequentContacts(String id);
 
-	Pagination<AdminListBo>  frequentContactsList(String depId, String name, String roleName, Integer pageSize, Integer pageNo);
+	Pagination<AdminListBo>  frequentContactsList(String deps, String name, String roleName, Integer pageSize, Integer pageNo);
 
 	int deleteFrequentContacts(String id);
 

+ 4 - 2
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -331,11 +331,13 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AdminListBo> frequentContactsList(String depId, String name,String roleName, Integer pageSize, Integer pageNo) {
+	public Pagination<AdminListBo> frequentContactsList(String deps, String name,String roleName, Integer pageSize, Integer pageNo) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
-		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if (StringUtils.isNotBlank(deps)){
+			params.put("depId", departmentService.parseArray(deps));
+		}
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if (StringUtils.isNotBlank(roleName)) params.put("roleName", roleName);
 		params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());

+ 10 - 4
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -802,8 +802,11 @@
     <if test="name != null">
       and b.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
     </if>
-    <if test="depId != null">
-      and b.department_id= #{depId,jdbcType=VARCHAR}
+    <if test="deps != null">
+      and b.department_id in
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
+      </foreach>
     </if>
     <if test="page_sql!=null">
       ${page_sql}
@@ -826,8 +829,11 @@
     <if test="name != null">
       and b.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
     </if>
-    <if test="depId != null">
-      and b.department_id= #{depId,jdbcType=VARCHAR}
+    <if test="deps != null">
+      and b.department_id in
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
+      </foreach>
     </if>
   </select>