Commit 8390b127 authored by 罗贤顺's avatar 罗贤顺

修复问题

parent b0108612
...@@ -239,7 +239,6 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses ...@@ -239,7 +239,6 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
Rcode.NOT_PARAM.assertNotNull(query.getX()); Rcode.NOT_PARAM.assertNotNull(query.getX());
Rcode.NOT_PARAM.assertNotNull(query.getY()); Rcode.NOT_PARAM.assertNotNull(query.getY());
Rcode.NOT_PARAM.assertNotNull(query.getZ()); Rcode.NOT_PARAM.assertNotNull(query.getZ());
Rcode.NOT_PARAM.assertNotNull(query.getDrillingDate());
//uid自动生成 不能手动设置 //uid自动生成 不能手动设置
if (query.getUid() != null) { if (query.getUid() != null) {
return R.failed("炮孔设计中->uid自动生成 不能手动设置"); return R.failed("炮孔设计中->uid自动生成 不能手动设置");
...@@ -301,7 +300,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses ...@@ -301,7 +300,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
tProcessesDrillingQuery.setUid(hole.getUid()); tProcessesDrillingQuery.setUid(hole.getUid());
//设置当前登录人(穿孔的制表人) //设置当前登录人(穿孔的制表人)
cn.wise.im.common.http.R str = itSysUserService.getLoginUser(); cn.wise.im.common.http.R str = itSysUserService.getLoginUser();
if (str.getCode() != 0) { if (str.getCode() == 0) {
log.error("炮孔设计中->获取当前登录人错误:{}", JSON.toJSONString(str)); log.error("炮孔设计中->获取当前登录人错误:{}", JSON.toJSONString(str));
return R.failed(str.getMessage()); return R.failed(str.getMessage());
} }
......
...@@ -19,8 +19,9 @@ spring: ...@@ -19,8 +19,9 @@ spring:
connection-test-query: SELECT 1 connection-test-query: SELECT 1
redis: redis:
port: 6379 port: 6379
host: localhost # host: localhost
# password: Wise_@123456 host: 192.168.110.85
# password: Wise_@123456
servlet: servlet:
multipart: multipart:
max-file-size: 100MB max-file-size: 100MB
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment