提交

src/main/java/cn/ezhizao/framework/web/page/PageDomain.java

@@ -19,7 +19,7 @@ public class PageDomain
     private String orderByColumn;
 
     /** 排序的方向desc或者asc */
-    private String isAsc = "asc";
+    private String isAsc = "desc";
 
     /** 分页参数合理化 */
     private Boolean reasonable = true;

src/main/java/cn/ezhizao/project/business/reconciliation/priceList/controller/BizEntrustOncePriceController.java

@@ -118,6 +118,10 @@ public class BizEntrustOncePriceController extends BaseController
         //判读是否存在该价目
         List<BizEntrustPrice> list = bizEntrustPriceService.getOnceList(bizEntrustPrice);
         if(list.size() > 0){
+            //如果存在，则判断是否是同一个价目
+            if(list.size() == 1&&list.get(0).getId().equals(bizEntrustPrice.getId())){
+                return toAjax(bizEntrustPriceService.updateById(bizEntrustPrice));
+            }
             return AjaxResult.error("该价目已存在");
         }
         return toAjax(bizEntrustPriceService.updateById(bizEntrustPrice));

src/main/java/cn/ezhizao/project/business/reconciliation/priceList/controller/BizEntrustPriceController.java

@@ -119,7 +119,13 @@ public class BizEntrustPriceController extends BaseController
         //判读是否存在该价目
         List<BizEntrustPrice> list = bizEntrustPriceService.getList(bizEntrustPrice);
         if(list.size() > 0){
-            return AjaxResult.error("该价目已存在");
+            //如果只有一条数据且id的相同
+            if(list.size()==1&&list.get(0).getId().equals(bizEntrustPrice.getId())){
+                return toAjax(bizEntrustPriceService.updateById(bizEntrustPrice));
+            }else{
+                return AjaxResult.error("该价目已存在");
+            }
+
         }
         return toAjax(bizEntrustPriceService.updateById(bizEntrustPrice));
     }

src/main/java/cn/ezhizao/project/system/controller/SysDictTypeController.java

@@ -57,7 +57,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 查询字典类型详细
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @PreAuthorize("@ss.hasPermi('system:dict:query,business:crm:dict:query')")
     @GetMapping(value = "/{dictId}")
     public AjaxResult getInfo(@PathVariable Long dictId)
     {
@@ -67,7 +67,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 新增字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @PreAuthorize("@ss.hasPermi('system:dict:add,business:crm:dict:add')")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDictType dict) throws NoSuchFieldException, IllegalAccessException {

src/main/java/cn/ezhizao/project/system/controller/SysModuleController.java

@@ -49,8 +49,7 @@ public class SysModuleController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysModule sysModule) throws NoSuchFieldException, IllegalAccessException
     {
-//        setTenantId(sysModule);
-//        startPage();
+        startOrderBy();
         List<SysModule> list = sysModuleService.getList(sysModule);
         return getDataTable(list);
     }
@@ -60,6 +59,7 @@ public class SysModuleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:module:export')")
     @Log(title = "模块管理", businessType = BusinessType.EXPORT)
+
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysModule sysModule) throws NoSuchFieldException, IllegalAccessException
     {

src/main/java/cn/ezhizao/project/system/controller/SysVersionController.java

@@ -53,6 +53,7 @@ public class SysVersionController extends BaseController
     {
 //        setTenantId(sysVersion);
         startPage();
+        startOrderBy();
         List<SysVersion> list = sysVersionService.getList(sysVersion);
         return getDataTable(list);
     }

src/main/java/cn/ezhizao/project/tenant/controller/TenantController.java

@@ -90,6 +90,7 @@ public class TenantController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(Tenant tenant) {
         startPage();
+        startOrderBy();
         if (StringUtils.isNotBlank(tenant.getOperateType())) {
             tenant.setUserId(SecurityUtils.getUserId());
         }
@@ -141,7 +142,7 @@ public class TenantController extends BaseController {
     /**
      * 获取企业租户详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:tenant:query')")
+//    @PreAuthorize("@ss.hasPermi('business:tenant:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         Tenant tenant = new Tenant();