Merge branch 'feat-oe' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -124,7 +124,8 @@ public class SysUserController {
 		}
 
 		// TODO OE临时角色 待删
-		if (Arrays.asList(roles).contains(28)) {
+		if (Arrays.asList(roles).contains(28) || Arrays.asList(roles).contains(30) || Arrays.asList(roles).contains(31)
+				|| Arrays.asList(roles).contains(32) || Arrays.asList(roles).contains(33) || Arrays.asList(roles).contains(34)) {
 			return true;
 		}