公司管理员不能登录砂站系统

ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java

@@ -251,7 +251,7 @@ public class InController extends Controller implements Runnable {
                     }
 
                     // 巴河进料需要减两吨
-                    if (CliCacheData.SUP.getId() == 4 && weight >  35){
+                    if ((CliCacheData.SUP.getId() == 4 || CliCacheData.SUP.getId() == 5) && weight >  35){
                         weight -= 2;
                     }
 

ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java

@@ -251,6 +251,10 @@ public class SysuserSyncService extends BaseService {
                 return Result.failed(false, "登陆失败");
             }
 
+            if(sysuser.getType() == UserTypeEnum.LEAD.getTypeid()){
+                return Result.failedstr("登陆失败。当前用户是公司管理员,请登陆结算中心系统");
+            }
+
             if (sysuser.getType() == UserTypeEnum.SUPERMARKET.getTypeid() && sysuser.getEntityId() != CliCacheData.SUP.getId()) {
                 return Result.failedstr("登陆失败。当前系统是%s", CliCacheData.SUP.getName());
             }