修改农户特有角色

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerInterceptor.java

@@ -48,7 +48,7 @@ public class UserEmpowerInterceptor implements Interceptor {
             try {
                 StdUserEmpower orgCode =(StdUserEmpower) redisUtils.get("Emp_"+RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
 
-                if(orgCode!=null&& orgCode.isFlag()){
+                if(orgCode!=null&& orgCode.isFlag()&&!orgCode.isFarmer()){
                     StatementHandler statementHandler = PluginUtils.realTarget(invocation.getTarget());
                     MetaObject metaObject = SystemMetaObject.forObject(statementHandler);
                     MappedStatement mappedStatement = (MappedStatement) metaObject.getValue("delegate.mappedStatement");

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserLimitsAdvice.java

@@ -49,6 +49,7 @@ public class UserLimitsAdvice {
 
     private static final String ROLEFLAG="-经销商-";
 
+    private static final String FARMER="-农户";
     private static final String ROLEFLAGADMIN="-经销商-管理员";
 
     private static final String ROLEFLDEVELOP="-经销商-开发";
@@ -84,6 +85,11 @@ public class UserLimitsAdvice {
             }else if (org.contains(ROLEFLDEVELOP)){
                 stdUserEmpower.setUserId(userid);
             }
+        }else if(org.contains(FARMER)){
+             //农户暂不做需求
+            stdUserEmpower.setFarmer(true);
+
+
         }else{
             LambdaQueryWrapper<StdUserEmpower> qu=new LambdaQueryWrapper();
             qu.eq(StdUserEmpower::getAmosUserId,userid);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/StdUserEmpower.java

@@ -73,4 +73,9 @@ public class StdUserEmpower extends BaseEntity {
     //经销商管理员区域公司orgcode
     @TableField(exist = false)
     private String adminRegionalCompaniesCode;
+
+
+    //是否农户
+    @TableField(exist = false)
+    private boolean farmer;
 }