root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev:BUG修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2024-03-08 17:08:11 +08:00
parent 0ad8c2e8b7
commit 41ed722cee
6 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
View File

@@ -472,6 +472,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
}
//查询一级
JSONArray pa = baseMapper.queryPdaAuthority(accountId, "0", null);
if(ObjectUtil.isEmpty(pa)){
throw new BadRequestException("当前用户无菜单权限！");
}
JSONObject result = pa.getJSONObject(0);
//查询二级
JSONArray SecondResults = baseMapper.queryPdaAuthority(accountId, "1", null);
@@ -484,7 +487,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
row.put("sonTree", ThirdResults);
roleTree.add(row);
}
result.put("sonTree", roleTree);
result.put("sonTree", roleTree);
returnjo.put("code", "1");
returnjo.put("desc", "查询成功！");

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java
View File

@@ -25,7 +25,9 @@ public enum RegionTypeEnum {
TWO_MX01("22", "二期木箱区", "1752254266938101760"),
TWO_KZ01("23", "二期捆扎区", "1754774130626007040"),
TWO_FH01("24", "二期发货区", "1759453285649092608"),
TWO_OUT01("25", "二期出库区", "1760141408548818944");
TWO_OUT01("25", "二期出库区", "1760141408548818944"),
B2_HKZC("26", "B2烘烤暂存区", "1766012860535803904");
private String name;
private String code;

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -204,6 +204,9 @@ public class BakingServiceImpl implements BakingService {
case "A4":
reging_id = RegionTypeEnum.D_HKZC.getId();
break;
case "B2":
reging_id = RegionTypeEnum.B2_HKZC.getId();
break;
default:
break;
}

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/URLEnum.java
View File

@@ -16,7 +16,7 @@ public enum URLEnum {
ACS_URL_A3("A3", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_A3").getValue()),
ACS_URL_A4("A4", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_A4").getValue()),
ACS_URL_LK("LK", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_LK").getValue()),
ACS_URL_Test("Test", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_Test").getValue());
ACS_URL_B2("B2", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_B2").getValue());
private final String product_area;

6
lms/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -7,10 +7,10 @@ spring:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms_test2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# username: ${DB_USER:root}
username: ${DB_USER:root}
password: ${DB_PWD:12356}
password: ${DB_PWD:root}
# 初始连接数
initial-size: 5
# 最小连接数
@@ -160,7 +160,7 @@ sa-token:
is-log: false
jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
# token 前缀
token-prefix:
token-prefix: Bearer
cookie:
# 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
domain:

2
lms/nladmin-ui/src/utils/request.js
View File

@@ -18,7 +18,7 @@ const service = axios.create({
service.interceptors.request.use(
config => {
if (getToken()) {
config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
config.headers['Authorization'] = getToken() ? 'Bearer ' + getToken() : undefined // 让每个请求携带自定义token 请根据实际情况自行修改
}
config.headers['Content-Type'] = 'application/json'
return config