123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BranchCompanyGiveBiz.java

@@ -27,6 +27,7 @@ public class BranchCompanyGiveBiz extends BaseBiz<BranchCompanyGiveMapper, Branc
         if (branchCompanyGive1 == null){
             insertSelectiveRe(branchCompanyGive);
         }else {
+            branchCompanyGive1.setId(branchCompanyGive1.getId());
             updateSelectiveById(branchCompanyGive);
         }
         Integer companyId = branchCompanyGive.getCompanyId();
@@ -34,10 +35,13 @@ public class BranchCompanyGiveBiz extends BaseBiz<BranchCompanyGiveMapper, Branc
         if (branchCompany1 != null){
             BranchCompany branchCompany=new BranchCompany();
             branchCompany.setId(companyId);
+            Integer giveNum = branchCompany1.getGiveNum() == null ? 0 :branchCompany1.getGiveNum();
             if (isDel == 1){
-                branchCompany.setGiveNum(branchCompany1.getGiveNum()-1);
+                giveNum=giveNum > 0 ? (giveNum-1):0;
+                branchCompany.setGiveNum(giveNum);
             }else {
-                branchCompany.setGiveNum(branchCompany1.getGiveNum()+1);
+                giveNum=giveNum+1;
+                branchCompany.setGiveNum(giveNum);
             }
             branchCompanyBiz.addOrUpd(branchCompany);
         }