wms / wms4_xinxiangweiliang · Commits

Commit 78451b6e149b8486d2ecfa85370d54b48c0bf221

Authored by zhangdaiscott
1 parent e9ef05a6

解决发现的几个bug 

严重bug,解决部分功能操作,提示文本空问题
严重bug,解决【用户管理】选择部门和上级以后，负责部门没有数据可选
严重bug,解决菜单数据规则，选择自定义SQL 规则值无法输入空格问题
我的部门下面的用户分配角色报错(无角色的情况下)
我的部门空数据的时候报错
云存储上传文件,不自定义域名出问题
Inline Side-by-side
Showing 6 changed files with 20 additions and 3 deletions
ant-design-vue-jeecg/src/components/dict/JDictSelectTag.vue
  View file @78451b6
... ... @@ -90,6 +90,8 @@
90 90 }
91 91 console.log(val);
92 92 this.$emit('change', val);
  93 + //LOWCOD-2146 【菜单】数据规则，选择自定义SQL 规则值无法输入空格
  94 + this.$emit('input', val);
93 95 },
94 96 setCurrentDictOptions(dictOptions){
95 97 this.dictOptions = dictOptions
... ...
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectDepart.vue
  View file @78451b6
... ... @@ -117,7 +117,8 @@
117 117 //返回选中的部门信息
118 118 backDeparInfo(){
119 119 if(this.backDepart===true){
120   - if(this.departIds && this.departIds.length>0){
  120 + //LOWCOD-2147 【用户管理】选择部门和上级以后，负责部门没有数据可选 (陶炎改造自定义返回字段导致)
  121 + if(this.storeVals && this.storeVals.length>0){
121 122 let arr1 = this.storeVals.split(',')
122 123 let arr2 = this.textVals.split(',')
123 124 let info = []
... ...
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
  View file @78451b6
... ... @@ -103,6 +103,14 @@ public class Result<T> implements Serializable {
103 103 return r;
104 104 }
105 105  
  106 + public static<T> Result<T> OK(String msg) {
  107 + Result<T> r = new Result<T>();
  108 + r.setSuccess(true);
  109 + r.setCode(CommonConstant.SC_OK_200);
  110 + r.setMessage(msg);
  111 + return r;
  112 + }
  113 +
106 114 public static<T> Result<T> OK(T data) {
107 115 Result<T> r = new Result<T>();
108 116 r.setSuccess(true);
... ...
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
  View file @78451b6
... ... @@ -154,7 +154,7 @@ public class OssBootUtil {
154 154 */
155 155 public static String getOriginalUrl(String url) {
156 156 String originalDomain = "https://" + bucketName + "." + endPoint;
157   - if(url.indexOf(staticDomain)!=-1){
  157 + if(oConvertUtils.isNotEmpty(staticDomain) && url.indexOf(staticDomain)!=-1){
158 158 url = url.replace(staticDomain,originalDomain);
159 159 }
160 160 return url;
... ...
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
  View file @78451b6
... ... @@ -205,7 +205,10 @@ public class SysDepartRoleController extends JeecgController&lt;SysDepartRole, ISys
205 205 List<SysDepartRole> roleList = sysDepartRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",departId));
206 206 List<String> roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
207 207 //根据角色id,用户id查询已授权角色
208   - List<SysDepartRoleUser> roleUserList = departRoleUserService.list(new QueryWrapper<SysDepartRoleUser>().eq("user_id",userId).in("drole_id",roleIds));
  208 + List<SysDepartRoleUser> roleUserList = null;
  209 + if(roleIds!=null && roleIds.size()>0){
  210 + roleUserList = departRoleUserService.list(new QueryWrapper<SysDepartRoleUser>().eq("user_id",userId).in("drole_id",roleIds));
  211 + }
209 212 result.setSuccess(true);
210 213 result.setResult(roleUserList);
211 214 return result;
... ...
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
  View file @78451b6
... ... @@ -288,6 +288,9 @@ public class SysDepartServiceImpl extends ServiceImpl&lt;SysDepartMapper, SysDepart
288 288 public List<String> getMySubDepIdsByDepId(String departIds) {
289 289 //根据部门id获取所负责部门
290 290 String[] codeArr = this.getMyDeptParentOrgCode(departIds);
  291 + if(codeArr==null || codeArr.length==0){
  292 + return null;
  293 + }
291 294 return this.baseMapper.getSubDepIdsByOrgCodes(codeArr);
292 295 }
293 296  
... ...