diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 2e8403e..8528900 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -94,7 +94,7 @@ public class Config extends JFinalConfig { public static DeviceThread deviceThread = new DeviceThread(); public static SocketIOService socketio = null; private static boolean client_run = true; - public static final String CLINET_VERSION = "20201024"; + public static final String CLINET_VERSION = "20201026"; public static String getRootPath() { return PathKit.getWebRootPath() diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java index a6f98ab..bc72759 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java @@ -145,7 +145,10 @@ public class InvoiceLogController extends Controller { if (tokenuser == null) { renderJson(Result.noauth()); return; - } else if (!SysuserSyncService.me.isTreasurer(tokenuser.getRole())) { // 财务才能录入专票 + } else if ( + !SysuserSyncService.me.isTreasurer(tokenuser.getRole()) + && !SysuserSyncService.me.isPresident(tokenuser.getRole()) + ) { // 和经理录入专票 renderJson(Result.permissionDenied()); return; } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java index d440e2a..a6b898c 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java @@ -111,7 +111,7 @@ public class SysuserSyncService extends BaseSyncService { /** * 2020-03-7 财务和总经理,必须选砂站管理员? - * 是否是财务人员 + * 是否是公司经理人员 * * @param roleid * @return