合并sso分支

This commit is contained in:
zhangzhiqiang
2022-12-29 14:26:55 +08:00
parent 5b772c0731
commit b5990f168e
298 changed files with 6834 additions and 6585 deletions

View File

@@ -14,7 +14,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.modules.common.utils.SecurityUtils;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
@@ -70,7 +70,7 @@ public List<${className}Dto> queryAll(Map whereJson){
@Override
@Transactional(rollbackFor = Exception.class)
public void create(${className}Dto dto) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
@@ -93,7 +93,7 @@ public List<${className}Dto> queryAll(Map whereJson){
${className}Dto entity = this.findById(dto.get${pkChangeColName ? cap_first }());
if (entity == null) throw new BadRequestException("被删除或无权限,操作失败!");
Long currentUserId = SecurityUtils.getCurrentUserId();
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
@@ -109,7 +109,7 @@ public List<${className}Dto> queryAll(Map whereJson){
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(${pkColumnType}[] ids) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();