|
@@ -87,7 +87,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
* @return
|
|
|
*/
|
|
|
public Boolean saveModuleInfo(AddModuleInfoVO addModulInfoVO){
|
|
|
-/* String userId = UserUtils.getCurrentPrincipleID();*/
|
|
|
+ String userId = UserUtils.getCurrentPrincipleID();
|
|
|
Date now = DateUtil.now();
|
|
|
//查询该模板是否添加过
|
|
|
QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
|
|
@@ -100,8 +100,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
}
|
|
|
ModuleInfo moduleInfo = new ModuleInfo();
|
|
|
BeanUtil.copyProperties(addModulInfoVO,moduleInfo);
|
|
|
- moduleInfo.setCreator("1"/*userId*/);
|
|
|
- moduleInfo.setModifier("1"/*userId*/);
|
|
|
+ moduleInfo.setCreator(userId);
|
|
|
+ moduleInfo.setModifier(userId);
|
|
|
moduleInfo.setGmtCreate(now);
|
|
|
moduleInfo.setGmtModified(now);
|
|
|
this.save(moduleInfo);
|
|
@@ -115,13 +115,13 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
* @return
|
|
|
*/
|
|
|
public Boolean updateModuleInfo(UpdateModuleInfoVO updateModuleInfoVO){
|
|
|
- /* String userId = UserUtils.getCurrentPrincipleID();*/
|
|
|
+ String userId = UserUtils.getCurrentPrincipleID();
|
|
|
UpdateWrapper<ModuleInfo> moduleInfoUpdateWrapper = new UpdateWrapper<>();
|
|
|
moduleInfoUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("id",updateModuleInfoVO.getId())
|
|
|
.set("name",updateModuleInfoVO.getName())
|
|
|
.set("type",updateModuleInfoVO.getType())
|
|
|
- .set("modifier","1")
|
|
|
+ .set("modifier",userId)
|
|
|
.set("gmt_modified",DateUtil.now());
|
|
|
this.update(new ModuleInfo(),moduleInfoUpdateWrapper);
|
|
|
AddModuleInfoVO addModuleInfoVO = new AddModuleInfoVO();
|