rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch '惠信/develop' into develop

This commit is contained in:
曹鹏飞 2025-03-03 14:52:04 +08:00
parent fba5088e8b e072a4bf00
commit e99b00fa89
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java
View File

@ -83,9 +83,9 @@ public class BaseAreaController extends ControllerBase {
ent.setDataCreateUserNo(AdminUserUtil.getUserNo()); ent.setDataCreateUserNo(AdminUserUtil.getUserNo());
ent.setDataCreateUserName(AdminUserUtil.getUserName()); ent.setDataCreateUserName(AdminUserUtil.getUserName());
ent.setDataCreateTime(LocalDateTime.now()); ent.setDataCreateTime(LocalDateTime.now());
ent.setDataModifyUserNo(AdminUserUtil.getUserNo()); // ent.setDataModifyUserNo(AdminUserUtil.getUserNo());
ent.setDataModifyUserName(AdminUserUtil.getUserName()); // ent.setDataModifyUserName(AdminUserUtil.getUserName());
ent.setDataModifyTime(LocalDateTime.now()); // ent.setDataModifyTime(LocalDateTime.now());
ent.setAreaCode(UniqueSequenceGenerator.generateCode(Constant.AreaCodePrefix)); ent.setAreaCode(UniqueSequenceGenerator.generateCode(Constant.AreaCodePrefix));
baseAreaService.save(ent); baseAreaService.save(ent);
return ApiResult.success(true); return ApiResult.success(true);

6
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java
View File

@ -118,9 +118,9 @@ public class PositionController extends ControllerBase {
ent.setDataCreateUserNo(AdminUserUtil.getUserNo()); ent.setDataCreateUserNo(AdminUserUtil.getUserNo());
ent.setDataCreateUserName(AdminUserUtil.getUserName()); ent.setDataCreateUserName(AdminUserUtil.getUserName());
ent.setDataCreateTime(LocalDateTime.now()); ent.setDataCreateTime(LocalDateTime.now());
ent.setDataModifyUserNo(AdminUserUtil.getUserNo()); // ent.setDataModifyUserNo(AdminUserUtil.getUserNo());
ent.setDataModifyUserName(AdminUserUtil.getUserName()); // ent.setDataModifyUserName(AdminUserUtil.getUserName());
ent.setDataModifyTime(LocalDateTime.now()); // ent.setDataModifyTime(LocalDateTime.now());
positionService.save(ent); positionService.save(ent);
return ApiResult.success(true); return ApiResult.success(true);
} }

8
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBasePartService.java
View File

@ -54,8 +54,8 @@ public class AdminBasePartService {
partEnt.setPartNo(UniqueSequenceGenerator.generateCode(Constant.PartCodePrefix)); partEnt.setPartNo(UniqueSequenceGenerator.generateCode(Constant.PartCodePrefix));
partEnt.setCreateBy(AdminUserUtil.getUserName()); partEnt.setCreateBy(AdminUserUtil.getUserName());
partEnt.setCreateTime(LocalDateTime.now()); partEnt.setCreateTime(LocalDateTime.now());
partEnt.setUpdateBy(AdminUserUtil.getUserName()); // partEnt.setUpdateBy(AdminUserUtil.getUserName());
partEnt.setUpdateTime(LocalDateTime.now()); // partEnt.setUpdateTime(LocalDateTime.now());
} else { //修改 } else { //修改
partEnt.setUpdateBy(AdminUserUtil.getUserName()); partEnt.setUpdateBy(AdminUserUtil.getUserName());
@ -118,8 +118,8 @@ public class AdminBasePartService {
partEnt.setEnable(1); partEnt.setEnable(1);
partEnt.setCreateBy(AdminUserUtil.getUserName()); partEnt.setCreateBy(AdminUserUtil.getUserName());
partEnt.setCreateTime(LocalDateTime.now()); partEnt.setCreateTime(LocalDateTime.now());
partEnt.setUpdateBy(AdminUserUtil.getUserName()); // partEnt.setUpdateBy(AdminUserUtil.getUserName());
partEnt.setUpdateTime(LocalDateTime.now()); // partEnt.setUpdateTime(LocalDateTime.now());
partService.save(partEnt); partService.save(partEnt);
} }
languageDataList.clear(); languageDataList.clear();