--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/content/SignLanguageMapper.java

@@ -107,7 +107,7 @@ public interface SignLanguageMapper extends BaseMapper<SignLanguage> {
 		    + "</if>"
 		    + "<if test='form.userType==3'>"
 				+ "<if test='"+ NOTBLANK +"(form.userId)'>"
-	    		+ " and sl.area_adminId = #{form.userId} "
+	    		+ " and re.userId = #{form.userId}"
 	    		+ "</if>"
     		+ "</if>"
     		+ "<if test='form.userType==4'>"

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/content/SignLanguageServiceImpl.java

@@ -215,9 +215,9 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
 						}
 					}
 					if(userType.equals(UserTypeEnum.TYPE_4.getCode())) {//只获取当前区域下分发的用户,中心管理员和系统用户获取全部
-						List<User> user=userMapper.queryByUser(li.getUserId(),area_adminId);
-						if(user.size()>0) {
-							sb.append(li.getUserName()+ "，");
+						User user = userMapper.selectByPrimaryKey(area_adminId);
+						if(user!=null) {
+							sb.append(user.getUserName());
 						}
 					}
 					if(userType.equals(UserTypeEnum.TYPE_1.getCode()) || userType.equals(UserTypeEnum.TYPE_2.getCode())) {
@@ -262,6 +262,7 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
 		startPage(pageParam);
 		String userId = redis.getUser().getUserId();
 		Integer userType = redis.getUser().getUserType();
+		form.setUserType(userType);
 		List<SignLanguageRelationListVo> list=null;
 		if(userType.equals(UserTypeEnum.TYPE_2.getCode()) || userType.equals(UserTypeEnum.TYPE_1.getCode())) {
 			list= mapper.relation_page(form);