Browse Source

根据白名单设置查询权限

anderx 2 years ago
parent
commit
6fdf8d9809

+ 12 - 3
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -300,19 +300,28 @@ public class AdminCustomerApiController extends BaseApiController{
 		return res;
 	}
 
-	/** 客户查询 **/
+	/**
+	 * 客户查询
+	 * @param name  查询名称
+	 * @param type  分类 0默认 1小程序App
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
 	@RequestMapping(value = "/getUserByNames",method = RequestMethod.GET)
-	public Result getUserByName(String name,Integer pageNo,Integer pageSize){
+	public Result getUserByName(String name,Integer type,Integer pageNo,Integer pageSize){
 		Result res = new Result();
 		if(StringUtils.isEmpty(name)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "名称","名称"));
 			return res;
 		}
 		if(name.length()<2) return res;
-		res.data(customerService.getUserByNames(name,pageNo,pageSize));
+		res.data(customerService.getUserByNames(name,type,pageNo,pageSize));
 		return res;
 	}
 
+
+
 	/** 添加客户基本信息
 	 * @throws Exception
 	 * @throws NumberFormatException **/

+ 1 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -527,7 +527,7 @@ public interface CustomerService {
 	int updateUserName(String uid, String userName);
 	List<UserNamesListBo> listUserName(String uid);
 	boolean checkUserName(String userName);
-	Object getUserByNames(String name, Integer pageNo, Integer pageSize);
+	Object getUserByNames(String name,Integer type, Integer pageNo, Integer pageSize);
 
 	Pagination<OutUserMianProducts> mainProductsList(InputMainProductsList in) ;
 

+ 8 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2462,8 +2462,15 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	@Override
-	public Object getUserByNames(String name, Integer pageNo, Integer pageSize) {
+	public Object getUserByNames(String name, Integer type,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
+		if (type!=null&&type==1){
+			Admin admin = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			if (admin.getPublicPurview()==0){
+				//根据白名单设置查询权限
+//				params.put("type", name);
+			}
+		}
 		params.put("name", name);
 		return  findPage("getUserByNameList", "getUserByNameCount", params, pageNo,pageSize);
 	}

+ 5 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -97,8 +97,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					prd.setMainStatus(1);
 				}else {
 					prd.setMainStatus(0);
-					//不是自己的企业则需要审核
+					//不是自己的企业则需要审核并设置非自己客户待审核
 					addPublicExamine(in.getId(),u.getAid());
+					if(in.getPublicType()==0)in.setPublicType(1);
 				}
 				prd.setPrid(in.getId());
 				prd.setUid(s);
@@ -126,6 +127,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		PublicRelease upName=new PublicRelease();
 		upName.setId(in.getId());
 		upName.setUserNames(userNames);
+		if (in.getPublicType()==1){
+			upName.setPublicType(1);
+		}
 		publicReleaseMapper.updateByPrimaryKeySelective(upName);
 		addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
 		Map<String, Object> map=addPublicReleaseLog(my, in,userNames,date);