|
|
@@ -415,8 +415,8 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<Object> getDialogList(String appId) {
|
|
|
- List<TakaiDialogRespDTO> dialogRespDTOS = takaiDialogMapper.selectDialogList(appId);
|
|
|
+ public List<Object> getDialogList(String appId, String userId) {
|
|
|
+ List<TakaiDialogRespDTO> dialogRespDTOS = takaiDialogMapper.selectDialogList(appId, userId);
|
|
|
//当前日期
|
|
|
LocalDate today = LocalDate.now();
|
|
|
//根据时间分组降序排序
|
|
|
@@ -734,7 +734,7 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int createApplication(TakaiApplicationParams params) {
|
|
|
+ public int createApplication(TakaiApplicationParams params, boolean isAdmin) {
|
|
|
ApprovalNode vo = getFirstApproverNode(); // 获取第一个审批对象
|
|
|
if(vo != null){
|
|
|
SnowflakeDigitGenerator snowflakeDigitGenerator = new SnowflakeDigitGenerator(1, 1);
|
|
|
@@ -751,10 +751,14 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
.knowledgeInfo(params.getKnowledge_info())
|
|
|
.sliceCount(params.getSlice_count())
|
|
|
.typeId(params.getTypeId())
|
|
|
- .status("5") // 未开始审核状态
|
|
|
- .approver(String.valueOf(vo.getApprover()))
|
|
|
- .nodeOrder(String.valueOf(vo.getNodeOrder()))
|
|
|
.build();
|
|
|
+ if(isAdmin){
|
|
|
+ info.setStatus("3"); // 有直接创建权限无需审核
|
|
|
+ }else{
|
|
|
+ info.setStatus("5"); // 未开始审核状态
|
|
|
+ info.setApprover(String.valueOf(vo.getApprover()));
|
|
|
+ info.setNodeOrder(String.valueOf(vo.getNodeOrder()));
|
|
|
+ }
|
|
|
info.setCreateBy(params.getUserId());
|
|
|
int i = takaiApplicationMapper.insertApplication(info);
|
|
|
if (i > 0) {
|
|
|
@@ -789,7 +793,7 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int updateApplication(TakaiApplicationParams params, String appId) {
|
|
|
+ public int updateApplication(TakaiApplicationParams params, String appId, boolean isAdmin) {
|
|
|
ApprovalNode vo = getFirstApproverNode(); // 获取第一个审批对象
|
|
|
if(vo != null){
|
|
|
TakaiApplication info = TakaiApplication.builder().appId(appId)
|
|
|
@@ -804,11 +808,16 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
.knowledgeInfo(params.getKnowledge_info())
|
|
|
.sliceCount(params.getSlice_count())
|
|
|
.typeId(params.getTypeId())
|
|
|
- .status("5") // 未开始审核状态
|
|
|
- .approver(String.valueOf(vo.getApprover()))
|
|
|
- .nodeOrder(String.valueOf(vo.getNodeOrder()))
|
|
|
- .comment(null)
|
|
|
.build();
|
|
|
+ if(isAdmin){
|
|
|
+ info.setStatus("3"); // 有直接修改权限无需审核
|
|
|
+ info.setApprover(null);
|
|
|
+ info.setNodeOrder(null);
|
|
|
+ }else{
|
|
|
+ info.setStatus("5"); // 未开始审核状态
|
|
|
+ info.setApprover(String.valueOf(vo.getApprover()));
|
|
|
+ info.setNodeOrder(String.valueOf(vo.getNodeOrder()));
|
|
|
+ }
|
|
|
info.setUpdateBy(params.getUserId());
|
|
|
int i = takaiApplicationMapper.updateApplication(info);
|
|
|
if (1 > 0) {
|