Browse Source

修改油站设置,新增油站默认设置

zangguocen 4 năm trước cách đây
mục cha
commit
693c17c58b

+ 0 - 2
yijia-admin/src/main/java/com/yijia/web/controller/system/SysDeptController.java

@@ -174,7 +174,6 @@ public class SysDeptController extends BaseController
     /**
      * 修改部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
@@ -199,7 +198,6 @@ public class SysDeptController extends BaseController
     /**
      * 删除部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId)

+ 4 - 4
yijia-system/src/main/java/com/yijia/system/service/impl/SysDeptServiceImpl.java

@@ -186,15 +186,15 @@ public class SysDeptServiceImpl implements ISysDeptService
         {
             throw new CustomException("部门停用,不允许新增");
         }
-        if(dept.getJiBie()!=null && dept.getJiBie().equals("2") ){
+        if(dept.getJiBie()!=null && dept.getJiBie() == 2){
             dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
             dept.setCardEnabledFlag("0");
             dept.setWsPrintFlag("2");
             dept.setPrintSetting("1");
             dept.setDiscountSetting("0");
-            dept.setIntegralPrintFlag("2");
-            dept.setIntegralFlag("2");
-        }else if(dept.getJiBie()!=null && dept.getJiBie().equals("1")){
+            dept.setIntegralPrintFlag("1");
+            dept.setIntegralFlag("1");
+        }else if(dept.getJiBie()!=null && dept.getJiBie()==1){
             dept.setCardRuleFlag("0");
             dept.setIntegralRuleFlag("0");
             dept.setCouponFlag("0");