diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index f7eefdd1..2ca1e22f 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -2,8 +2,11 @@ package com.qs.serve.modules.sys.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.crypto.SecureUtil; +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; +import com.google.gson.JsonArray; import com.qs.serve.common.framework.security.model.LoginUser; import com.qs.serve.common.model.annotation.LimitSubmit; import com.qs.serve.common.model.annotation.SysLog; @@ -59,8 +62,12 @@ public class SysUserController { @GetMapping("/getSyUserList") public R getSyUserList(String code){ SeeYonRequestBaseService service = SpringUtils.getBean(SeeYonRequestBaseService.class); + if(!StringUtils.hasText(code)){ + return R.ok(); + } R rs = service.getBase(TbsSeeYonConst.OA_USER_LIST+"?code="+code,null); - return R.ok(rs.getData()); + String listJson = rs.getMsg(); + return R.ok(JSONUtil.parseArray(listJson)); } diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index cbb2c493..2aeac3fb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java @@ -46,7 +46,7 @@ public interface TbsSeeYonConst { String API_ADD_NODE = "/process/addNode"; String API_COUNT_NOT_OK = "/process/countUnfinished"; - String OA_USER_LIST = "/process/getSyUserList"; + String OA_USER_LIST = "/process/getUsersByCode"; String XLT_SAVE_CHECK = "/xlt/saveCheck"; String XLT_SAVE_PAYMENT = "/xlt/savePayment";