Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

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

@@ -194,11 +194,11 @@ xss:
 
 dsk:
   open:
-    #    endPoint: sandbox.openapi.jiansheku.com
-    #    accessKeyId: aec7b3ff2e8b48e79a7e2c463ce21912
-    #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    #    protocol: https
-    endPoint: 120.27.13.145:8865
+#    endPoint: 120.27.13.145:8865
+#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+#    protocol: http
+    endPoint: openapi.jiansheku.com
     accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
     accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: http
+    protocol: https

dsk-operate-ui/src/utils/request.js

@@ -67,7 +67,7 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-    const apiList = ['/login']  //需要提示错误的接口
+    const apiList = ['/login', '/system/user/profile/updatePwd']  //需要提示错误的接口
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -152,7 +152,16 @@ public class EnterpriseService {
     public TableDataInfo dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
         if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/dynamic", BeanUtil.beanToMap(body, false, false));
-        return dskOpenApiUtil.responsePage(map);
+        //底层接口写死了pageSize为10，这里前端只要5条
+//        return dskOpenApiUtil.responsePage(map);
+
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        Map data = MapUtils.getMap(map, "data", null);
+        if (200 != code) throw new RuntimeException();
+        Integer count = MapUtils.getInteger(data, "totalCount", 0);
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+
+        return new TableDataInfo(body.getPageSize() <= list.size() ? list.subList(0, body.getPageSize()) : list, count);
     }
 
     public R icInfo(EnterpriseIcInfoBody body) throws Exception {

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -81,6 +81,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      */
     @Override
     public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
+        if(StringUtils.isEmpty(dto.getMinAmount()))dto.setMinAmount("0");
         List<BusinessListVo> othersList = new ArrayList<>();
         //userId不传值，就查询全部他人可见项目+自己的
         if (dto.getUserId() == null) {

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -111,15 +111,15 @@
                 </foreach>
             </if>
             <if test="minAmount != null and minAmount != '' and minAmount != 0 and maxAmount != minAmount">
-                and i.investment_amount &gt;= #{minAmount}
+                and i.investment_amount &gt; #{minAmount}
             </if>
             <if test="minAmount == 0 and maxAmount != minAmount">
-                and ((i.investment_amount &gt;= #{minAmount}
-                and i.investment_amount &lt; #{maxAmount})
+                and ((i.investment_amount &gt; #{minAmount}
+                and i.investment_amount &lt;= #{maxAmount})
                 or i.investment_amount is null)
             </if>
             <if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount and minAmount != 0">
-                and i.investment_amount &lt; #{maxAmount}
+                and i.investment_amount &lt;= #{maxAmount}
             </if>
             <if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount">
                 and i.investment_amount = #{minAmount}