40609a1bd11ce79445562ac23f16af23a48c3933..b42aecb23d3b2baa52fd7474282dfc1018fd066e
2023-08-18 jiaosong
Merge remote-tracking branch 'origin/master'
b42aec 对比 | 目录
2023-08-18 jiaosong
#产出计算
29c9a7 对比 | 目录
已修改2个文件
4 ■■■■ 文件已修改
server/src/main/java/doumeemes/config/shiro/ShiroRealm.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/config/shiro/ShiroRealm.java
@@ -129,7 +129,7 @@
            }
            com = companyExtService.getModelById(authenticationToken.getCompanyId());
            if(com == null || Constants.equalsInteger( com.getDeleted(),Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,该账户异常!请联系管理员");
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,该账户删除!请联系管理员");
            }
            if(Constants.equalsInteger( com.getStatus(),Constants.ZERO) ){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,该企业已禁用!");
server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
@@ -399,7 +399,7 @@
        Date pDate = DateUtil.getDateFromString(DateUtil.getShortTime(p.getPlanDate()) +" 00:00:00");
        Date nDate =  DateUtil.getDateFromString(DateUtil.getShortTime(DateUtil.getCurrentDate()) +" 23:59:59");
        if( nDate.getTime() > pDate.getTime()){
        if( nDate.getTime() < pDate.getTime()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起,计划生产日期必须为今天以后的日期!");
        }
        p.setMaterialCode(p.getMaterialCode().trim());