guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

修复不兼容阿里JSONUtil

dev-9.10-修复中台bug-xuyifeng
huangyuxuan 2024-09-05 13:51:14 +08:00
parent f629b35351
commit 1d66e96757
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -11,7 +11,6 @@ import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.zcloud.dto.UpdateEnum; import com.zcloud.dto.UpdateEnum;
import com.zcloud.entity.system.Dictionaries; import com.zcloud.entity.system.Dictionaries;
import com.zcloud.entity.system.User;
import com.zcloud.service.bus.*; import com.zcloud.service.bus.*;
import com.zcloud.service.system.*; import com.zcloud.service.system.*;
import com.zcloud.syncData.SyncPlatformAdvice; import com.zcloud.syncData.SyncPlatformAdvice;
@ -20,10 +19,8 @@ import com.zcloud.util.*;
import org.apache.commons.collections.map.ListOrderedMap; import org.apache.commons.collections.map.ListOrderedMap;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import org.apache.fop.layoutmgr.PaddingElement;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.crypto.hash.SimpleHash; import org.apache.shiro.crypto.hash.SimpleHash;
import org.hyperic.sigar.pager.PageList;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -40,8 +37,6 @@ import com.zcloud.entity.PageData;
import com.zcloud.entity.system.Role; import com.zcloud.entity.system.Role;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import sun.security.krb5.internal.PAData;
import sun.util.logging.resources.logging;
/** /**
* 说明：系统用户处理类 * 说明：系统用户处理类
@ -1034,7 +1029,7 @@ public class UsersController extends BaseController {
map.put("USER_ID",ID); map.put("USER_ID",ID);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("code", "0"); map.put("code", "0");
map.put("syncInfo", JSONUtils.toJSONString(userinfo)); map.put("syncInfo", JSONUtil.toJsonStr(userinfo));
} else { } else {
map.put("result", "您输入的身份证号和用户名二次校验失败，请确认后重新申请"); //返回结果 map.put("result", "您输入的身份证号和用户名二次校验失败，请确认后重新申请"); //返回结果
} }