委托列表 作为首页，添加角色的时候默认必须添加这个菜单

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysRoleServiceImpl.java

@@ -81,6 +81,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 		SysRole role = new SysRole();
 		BeanUtils.copyProperties(query, role);
 		List<Integer> permissionIds = query.getPermissionIds();
+		if(!permissionIds.contains(2)){
+			permissionIds.add(2);
+		}
+		if(!permissionIds.contains(11)){
+			permissionIds.add(11);
+		}
 		role.setStatus(1);
 		role.setCreateTime(LocalDateTime.now());
 		roleMapper.insert(role);
@@ -109,6 +115,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 		SysRole role = new SysRole();
 		BeanUtils.copyProperties(query, role);
 		List<Integer> permissionIds = query.getPermissionIds();
+		if(!permissionIds.contains(2)){
+			permissionIds.add(2);
+		}
+		if(!permissionIds.contains(11)){
+			permissionIds.add(11);
+		}
 		roleMapper.updateById(role);
 		roleMapper.deleteRolePermission(role.getId());
 		if (!CollectionUtils.isEmpty(permissionIds)) {

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java

@@ -128,28 +128,34 @@ public class WeiXinService {
             wrapper.eq("wx_id", userJson.getString("userid"));
             SysUser sysUser = userService.getOne(wrapper);
             if (sysUser == null) {
-                UserQuery query = new UserQuery();
-                query.setUsername(userJson.getString("userid"));
-                query.setName(userJson.getString("name"));
-                Integer sexVal = userJson.getInteger("gender"); //企业微信1男2女  系统1男0女
-                query.setSex(sexVal==1?1:sexVal==2?0:null);
-                query.setGroupId(2);
-                query.setPostId(2);
-                query.setWxId(userJson.getString("userid"));
-                query.setQualifications(userJson.getString("position"));
-                query.setWorkYear(null);
-                query.setPhone(userJson.getString("mobile"));
-                query.setFax(null);
-                query.setMajor(null);
-                query.setEmail(userJson.getString("email"));
-                query.setTechnologyDate(null);
-                query.setTechnologyYear(null);
-                query.setEducation(null);
-                query.setRemark(null);
-                query.setRoleId(2);
-                BaseResponse<SysUser> baseResponse = userService.create(query);
-                sysUser = baseResponse.getData();
+	            QueryWrapper<SysUser> wrapper2 = new QueryWrapper<>();
+	            wrapper2.eq("phone", userJson.getString("mobile"));
+	            sysUser = userService.getOne(wrapper2);
+	            if(sysUser == null){
+		            UserQuery query = new UserQuery();
+		            query.setUsername(userJson.getString("userid"));
+		            query.setName(userJson.getString("name"));
+		            Integer sexVal = userJson.getInteger("gender"); //企业微信1男2女  系统1男0女
+		            query.setSex(sexVal==1?1:sexVal==2?0:null);
+		            query.setGroupId(2);
+		            query.setPostId(2);
+		            query.setWxId(userJson.getString("userid"));
+		            query.setQualifications(userJson.getString("position"));
+		            query.setWorkYear(null);
+		            query.setPhone(userJson.getString("mobile"));
+		            query.setFax(null);
+		            query.setMajor(null);
+		            query.setEmail(userJson.getString("email"));
+		            query.setTechnologyDate(null);
+		            query.setTechnologyYear(null);
+		            query.setEducation(null);
+		            query.setRemark(null);
+		            query.setRoleId(2);
+		            BaseResponse<SysUser> baseResponse = userService.create(query);
+		            sysUser = baseResponse.getData();
 //                return BaseResponse.errorMsg("非系统用户不允许登录!");
+	            }
+
             }
             if (sysUser.getStatus() == 0) {
                 return BaseResponse.errorMsg("用户被禁用!");