解决发现的几个bug

严重bug,解决部分功能操作,提示文本空问题严重bug,解决【用户管理】选择部门和上级以后，负责部门没有数据可选严重bug,解决菜单数据规则，选择自定义SQL 规则值无法输入空格问题我的部门下面的用户分配角色报错(无角色的情况下) 我的部门空数据的时候报错云存储上传文件,不自定义域名出问题

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