Merge remote-tracking branch 'origin/master'

suishenbang-admin/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 ruoyi:
   # 名称
-  name: SteelfurnitureManager
+  name: suishenbang-oneportal
   # 版本
   version: 4.0.0
   # 版权年份

suishenbang-admin/src/main/resources/application-test.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 ruoyi:
   # 名称
-  name: SteelfurnitureManager
+  name: suishenbang-oneportal
   # 版本
   version: 4.0.0
   # 版权年份
@@ -12,7 +12,7 @@ ruoyi:
   profile: /home/suishenbang/file
   # 获取ip地址开关
   addressEnabled: true
-  cloudPath: http://10.32.2.212:8010/
+  cloudPath: http://10.32.2.212:8000/
 
 # 开发环境配置
 server:

suishenbang-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/project/steelfurniture/logs" />
+	<property name="log.path" value="/home/suishenbang/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

suishenbang-admin/src/main/resources/templates/system/role/dataScope.html

@@ -26,7 +26,7 @@
 					<select id="dataScope" name="dataScope" class="form-control m-b">
 						<!--如果-->
 						<option value="1" th:field="*{dataScope}" th:style="(${isAdmin})?'':'display:none;'">全部数据权限</option>
-						<option value="6" th:field="*{dataScope}">本公司数据权限</option>
+						<!--<option value="6" th:field="*{dataScope}">本公司数据权限</option>-->
 						<option value="2" th:field="*{dataScope}">自定数据权限</option>
 						<option value="3" th:field="*{dataScope}">本部门数据权限</option>
 						<option value="4" th:field="*{dataScope}">本部门及以下数据权限</option>

suishenbang-api/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/project/steelfurniture/logs" />
+	<property name="log.path" value="/home/suishenbang/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

suishenbang-framework/src/main/java/com/dgtly/framework/aspectj/DataScopeAspect.java

@@ -138,34 +138,34 @@ public class DataScopeAspect
                     sqlString.append(" OR 1=0 ");
                 }
             }//数据权限为查看全部公司数据
-            else if (DATA_SCOPE_COMPANY.equals(dataScope))
-            {
-                /*查看整个公司数据权限：
-                * 1.查询出数据所属部门的ancestors
-                * 2.查询出查询人的公司id也就是部门的第三级
-                * 3。公司id包含在数据所属部门的ancestors后认为是公司所属数据
-                * */
-                StringBuilder companysqlString = new StringBuilder();
-                companysqlString.append(StringUtils.format(
-                        "select SUBSTRING_INDEX(" +
-                                "           SUBSTRING_INDEX(companyAncestors.ancestors,',',3)" +  //查询部门Ancestors左往右数，第3个分隔符的左边的全部内容
-                                "   ,',',-1) company_id " +//查询完前三个数组后右往左数，第1个分隔符的右边的全部内容
-                                "from(" +
-                                "   select" +
-                                "       companyDept.ancestors " +
-                                "   from" +
-                                "       sys_dept companyDept " +
-                                "   where" +
-                                "       companyDept.dept_id ={} " +
-                                "   and " +
-                                "       LENGTH(companyDept.ancestors )>6 " +
-                                ") companyAncestors",user.getDeptId()));
-
-                sqlString.append(StringUtils.format(
-                        " OR FIND_IN_SET( ( "+companysqlString.toString()+" ),{}.ancestors) " +
-                                " OR {}.dept_id =("+companysqlString.toString()+")",//判断数据是否由公司管理员创建
-                         deptAlias,deptAlias));
-            }
+//            else if (DATA_SCOPE_COMPANY.equals(dataScope))
+//            {
+//                /*查看整个公司数据权限：
+//                * 1.查询出数据所属部门的ancestors
+//                * 2.查询出查询人的公司id也就是部门的第三级
+//                * 3。公司id包含在数据所属部门的ancestors后认为是公司所属数据
+//                * */
+//                StringBuilder companysqlString = new StringBuilder();
+//                companysqlString.append(StringUtils.format(
+//                        "select SUBSTRING_INDEX(" +
+//                                "           SUBSTRING_INDEX(companyAncestors.ancestors,',',3)" +  //查询部门Ancestors左往右数，第3个分隔符的左边的全部内容
+//                                "   ,',',-1) company_id " +//查询完前三个数组后右往左数，第1个分隔符的右边的全部内容
+//                                "from(" +
+//                                "   select" +
+//                                "       companyDept.ancestors " +
+//                                "   from" +
+//                                "       sys_dept companyDept " +
+//                                "   where" +
+//                                "       companyDept.dept_id ={} " +
+//                                "   and " +
+//                                "       LENGTH(companyDept.ancestors )>6 " +
+//                                ") companyAncestors",user.getDeptId()));
+//
+//                sqlString.append(StringUtils.format(
+//                        " OR FIND_IN_SET( ( "+companysqlString.toString()+" ),{}.ancestors) " +
+//                                " OR {}.dept_id =("+companysqlString.toString()+")",//判断数据是否由公司管理员创建
+//                         deptAlias,deptAlias));
+//            }
         }
 
         if (StringUtils.isNotBlank(sqlString.toString()))

suishenbang-order/src/main/java/com/dgtly/order/controller/OrderBaseController.java

@@ -62,7 +62,7 @@ public class OrderBaseController extends BaseController {
         MultiValueMap<String, Object> map = MapDataUtil.convertMultiValueMap(request);
             HttpEntity<Object> requestEntity
                 = new HttpEntity<>(map, headers);
-        String str = restTemplate.postForObject(cloudPath + request.getRequestURI(), requestEntity, String.class);
+        String str = restTemplate.postForObject(cloudPath + "/order"+request.getRequestURI(), requestEntity, String.class);
         return str;
     }
 
@@ -72,7 +72,7 @@ public class OrderBaseController extends BaseController {
      */
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mmap) {
-        String str = restTemplate.getForObject(cloudPath + "/order/orderbase/info/" + id, String.class);
+        String str = restTemplate.getForObject(cloudPath + "/order/order/orderbase/info/" + id, String.class);
         OrderBase orderBase = JSONObject.toJavaObject(JSON.parseObject(str), OrderBase.class);
         mmap.put("orderBase", orderBase);
         return prefix + "/edit";

suishenbang-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -23,10 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope,
             r.status, r.del_flag, r.create_time, r.remark 
         from sys_role r
-	        left join sys_user_role ur on ur.role_id = r.role_id
+-- 	        left join sys_user_role ur on ur.role_id = r.role_id
+-- 	        left join sys_user u on u.user_id = ur.user_id
+-- 	        left join sys_user u1 on u1.login_name = r.create_by
+-- 	        left join sys_dept d on u1.dept_id = d.dept_id
+            left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
-	        left join sys_user u1 on u1.login_name = r.create_by
-	        left join sys_dept d on u1.dept_id = d.dept_id
+	        left join sys_dept d on u.dept_id = d.dept_id
     </sql>
     
     <sql id="selectRoleVo">