From a1b07b8a9c0587a11999453699bab9c78298e6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <852955+jishenghua@users.noreply.gitee.com> Date: Sat, 13 Apr 2019 22:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=84=E7=B1=BB=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E6=95=B0=E6=8D=AE=E8=83=BD=E6=9F=A5=E5=87=BA=E5=B7=B2?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/service/account/AccountService.java | 40 +++++++++++++------ .../accountItem/AccountItemService.java | 1 + .../com/jsh/erp/service/app/AppService.java | 10 +++-- .../jsh/erp/service/depot/DepotService.java | 4 +- .../service/depotHead/DepotHeadService.java | 3 +- .../service/depotItem/DepotItemService.java | 1 + .../service/functions/FunctionsService.java | 11 +++-- .../service/inOutItem/InOutItemService.java | 5 ++- .../erp/service/material/MaterialService.java | 2 + .../MaterialPropertyService.java | 2 + .../jsh/erp/service/person/PersonService.java | 5 ++- .../com/jsh/erp/service/role/RoleService.java | 1 + .../erp/service/supplier/SupplierService.java | 15 ++++--- .../systemConfig/SystemConfigService.java | 2 + .../com/jsh/erp/service/unit/UnitService.java | 1 + .../userBusiness/UserBusinessService.java | 20 +++++++--- 16 files changed, 86 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/jsh/erp/service/account/AccountService.java b/src/main/java/com/jsh/erp/service/account/AccountService.java index e604b7c1..8666d2dd 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/src/main/java/com/jsh/erp/service/account/AccountService.java @@ -64,6 +64,7 @@ public class AccountService { public List getAccount() { AccountExample example = new AccountExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return accountMapper.selectByExample(example); } @@ -132,6 +133,7 @@ public class AccountService { public List findBySelect() { AccountExample example = new AccountExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("id desc"); return accountMapper.selectByExample(example); } @@ -152,13 +154,15 @@ public class AccountService { Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null); if (type.equals("month")) { example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款") - .andOpertimeGreaterThanOrEqualTo(bTime).andOpertimeLessThanOrEqualTo(eTime); + .andOpertimeGreaterThanOrEqualTo(bTime).andOpertimeLessThanOrEqualTo(eTime) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else if (type.equals("date")) { example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款") - .andOpertimeLessThanOrEqualTo(mTime); + .andOpertimeLessThanOrEqualTo(mTime).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } } else { - example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款"); + example.createCriteria().andAccountidEqualTo(id).andPaytypeNotEqualTo("预付款") + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } List dataList = depotHeadMapper.selectByExample(example); if (dataList != null) { @@ -190,13 +194,16 @@ public class AccountService { Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null); if (type.equals("month")) { example.createCriteria().andAccountidEqualTo(id) - .andBilltimeGreaterThanOrEqualTo(bTime).andBilltimeLessThanOrEqualTo(eTime); + .andBilltimeGreaterThanOrEqualTo(bTime).andBilltimeLessThanOrEqualTo(eTime) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else if (type.equals("date")) { example.createCriteria().andAccountidEqualTo(id) - .andBilltimeLessThanOrEqualTo(mTime); + .andBilltimeLessThanOrEqualTo(mTime) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } } else { - example.createCriteria().andAccountidEqualTo(id); + example.createCriteria().andAccountidEqualTo(id) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } List dataList = accountHeadMapper.selectByExample(example); if (dataList != null) { @@ -227,9 +234,11 @@ public class AccountService { Date eTime = StringUtil.getDateByString(timeStr + "-31 00:00:00", null); Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null); if (type.equals("month")) { - example.createCriteria().andBilltimeGreaterThanOrEqualTo(bTime).andBilltimeLessThanOrEqualTo(eTime); + example.createCriteria().andBilltimeGreaterThanOrEqualTo(bTime).andBilltimeLessThanOrEqualTo(eTime) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else if (type.equals("date")) { - example.createCriteria().andBilltimeLessThanOrEqualTo(mTime); + example.createCriteria().andBilltimeLessThanOrEqualTo(mTime) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } } List dataList = accountHeadMapper.selectByExample(example); @@ -245,9 +254,11 @@ public class AccountService { AccountItemExample exampleAi = new AccountItemExample(); if (!ids.equals("")) { List idList = StringUtil.strToLongList(ids); - exampleAi.createCriteria().andAccountidEqualTo(id).andHeaderidIn(idList); + exampleAi.createCriteria().andAccountidEqualTo(id).andHeaderidIn(idList) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else { - exampleAi.createCriteria().andAccountidEqualTo(id); + exampleAi.createCriteria().andAccountidEqualTo(id) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } List dataListOne = accountItemMapper.selectByExample(exampleAi); if (dataListOne != null) { @@ -282,13 +293,16 @@ public class AccountService { Date mTime = StringUtil.getDateByString(timeStr + "-01 00:00:00", null); if (type.equals("month")) { example.createCriteria().andAccountidlistLike("%" +id.toString() + "%") - .andOpertimeGreaterThanOrEqualTo(bTime).andOpertimeLessThanOrEqualTo(eTime); + .andOpertimeGreaterThanOrEqualTo(bTime).andOpertimeLessThanOrEqualTo(eTime) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else if (type.equals("date")) { example.createCriteria().andAccountidlistLike("%" +id.toString() + "%") - .andOpertimeLessThanOrEqualTo(mTime); + .andOpertimeLessThanOrEqualTo(mTime) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } } else { - example.createCriteria().andAccountidlistLike("%" +id.toString() + "%"); + example.createCriteria().andAccountidlistLike("%" +id.toString() + "%") + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } List dataList = depotHeadMapper.selectByExample(example); if (dataList != null) { diff --git a/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java b/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java index 319d2bb7..c1ad30dc 100644 --- a/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java +++ b/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java @@ -49,6 +49,7 @@ public class AccountItemService { public List getAccountItem() { AccountItemExample example = new AccountItemExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return accountItemMapper.selectByExample(example); } diff --git a/src/main/java/com/jsh/erp/service/app/AppService.java b/src/main/java/com/jsh/erp/service/app/AppService.java index 5e97b3b3..150091a1 100644 --- a/src/main/java/com/jsh/erp/service/app/AppService.java +++ b/src/main/java/com/jsh/erp/service/app/AppService.java @@ -42,7 +42,7 @@ public class AppService { public List findDock(){ AppExample example = new AppExample(); - example.createCriteria().andZlEqualTo("dock").andEnabledEqualTo(true); + example.createCriteria().andZlEqualTo("dock").andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Sort"); List list = appMapper.selectByExample(example); return list; @@ -57,7 +57,7 @@ public class AppService { */ public List findDesk(){ AppExample example = new AppExample(); - example.createCriteria().andZlEqualTo("desk").andEnabledEqualTo(true); + example.createCriteria().andZlEqualTo("desk").andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Sort"); List list = appMapper.selectByExample(example); return list; @@ -69,6 +69,7 @@ public class AppService { public List getApp() { AppExample example = new AppExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return appMapper.selectByExample(example); } @@ -108,7 +109,7 @@ public class AppService { public List findRoleAPP(){ AppExample example = new AppExample(); - example.createCriteria().andEnabledEqualTo(true); + example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Sort"); List list = appMapper.selectByExample(example); return list; @@ -117,7 +118,8 @@ public class AppService { public List findAppInIds(String ids, String type){ List idList = StringUtil.strToLongList(ids); AppExample example = new AppExample(); - example.createCriteria().andZlEqualTo(type).andEnabledEqualTo(true).andIdIn(idList); + example.createCriteria().andZlEqualTo(type).andEnabledEqualTo(true).andIdIn(idList) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Sort"); List list = appMapper.selectByExample(example); return list; diff --git a/src/main/java/com/jsh/erp/service/depot/DepotService.java b/src/main/java/com/jsh/erp/service/depot/DepotService.java index 08257030..8b2edfbc 100644 --- a/src/main/java/com/jsh/erp/service/depot/DepotService.java +++ b/src/main/java/com/jsh/erp/service/depot/DepotService.java @@ -47,11 +47,13 @@ public class DepotService { public List getDepot() { DepotExample example = new DepotExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return depotMapper.selectByExample(example); } public List getAllList() { DepotExample example = new DepotExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("sort"); return depotMapper.selectByExample(example); } @@ -99,7 +101,7 @@ public class DepotService { public List findUserDepot(){ DepotExample example = new DepotExample(); - example.createCriteria().andTypeEqualTo(0); + example.createCriteria().andTypeEqualTo(0).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Sort"); List list = depotMapper.selectByExample(example); return list; diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 7157b58e..a78aba33 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -64,6 +64,7 @@ public class DepotHeadService { public List getDepotHead() { DepotHeadExample example = new DepotHeadExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return depotHeadMapper.selectByExample(example); } @@ -191,7 +192,7 @@ public class DepotHeadService { DepotHeadExample example = new DepotHeadExample(); monthTime = monthTime + "-31 23:59:59"; Date month = StringUtil.getDateByString(monthTime, null); - example.createCriteria().andOpertimeLessThanOrEqualTo(month); + example.createCriteria().andOpertimeLessThanOrEqualTo(month).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return depotHeadMapper.selectByExample(example); } diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 98bf5fe1..48cc8070 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -66,6 +66,7 @@ public class DepotItemService { public List getDepotItem() { DepotItemExample example = new DepotItemExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return depotItemMapper.selectByExample(example); } diff --git a/src/main/java/com/jsh/erp/service/functions/FunctionsService.java b/src/main/java/com/jsh/erp/service/functions/FunctionsService.java index 61957623..1429b367 100644 --- a/src/main/java/com/jsh/erp/service/functions/FunctionsService.java +++ b/src/main/java/com/jsh/erp/service/functions/FunctionsService.java @@ -42,6 +42,7 @@ public class FunctionsService { public List getFunctions() { FunctionsExample example = new FunctionsExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return functionsMapper.selectByExample(example); } @@ -88,7 +89,8 @@ public class FunctionsService { public List getRoleFunctions(String pNumber) { FunctionsExample example = new FunctionsExample(); - example.createCriteria().andEnabledEqualTo(true).andPnumberEqualTo(pNumber); + example.createCriteria().andEnabledEqualTo(true).andPnumberEqualTo(pNumber) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Sort"); List list = functionsMapper.selectByExample(example); return list; @@ -96,7 +98,8 @@ public class FunctionsService { public List findRoleFunctions(String pnumber){ FunctionsExample example = new FunctionsExample(); - example.createCriteria().andEnabledEqualTo(true).andPnumberEqualTo(pnumber); + example.createCriteria().andEnabledEqualTo(true).andPnumberEqualTo(pnumber) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Sort"); List list = functionsMapper.selectByExample(example); return list; @@ -105,11 +108,13 @@ public class FunctionsService { public List findByIds(String functionsIds){ List idList = StringUtil.strToLongList(functionsIds); FunctionsExample example = new FunctionsExample(); - example.createCriteria().andEnabledEqualTo(true).andIdIn(idList); + example.createCriteria().andEnabledEqualTo(true).andIdIn(idList) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Sort asc"); List list = functionsMapper.selectByExample(example); return list; } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int batchDeleteFunctionsByIds(String ids) { logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_FUNCTIONS, diff --git a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java index 4fbd7007..a3797a36 100644 --- a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java +++ b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java @@ -49,6 +49,7 @@ public class InOutItemService { public List getInOutItem() { InOutItemExample example = new InOutItemExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return inOutItemMapper.selectByExample(example); } @@ -96,9 +97,9 @@ public class InOutItemService { public List findBySelect(String type) { InOutItemExample example = new InOutItemExample(); if (type.equals("in")) { - example.createCriteria().andTypeEqualTo("收入"); + example.createCriteria().andTypeEqualTo("收入").andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else if (type.equals("out")) { - example.createCriteria().andTypeEqualTo("支出"); + example.createCriteria().andTypeEqualTo("支出").andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } example.setOrderByClause("id desc"); return inOutItemMapper.selectByExample(example); diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java index 7644f1d7..431344e1 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -45,6 +45,7 @@ public class MaterialService { public List getMaterial() { MaterialExample example = new MaterialExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return materialMapper.selectByExample(example); } @@ -175,6 +176,7 @@ public class MaterialService { public List findByOrder(){ MaterialExample example = new MaterialExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Name,Model asc"); return materialMapper.selectByExample(example); } diff --git a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java index 96355e42..c5a44684 100644 --- a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java +++ b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java @@ -42,8 +42,10 @@ public class MaterialPropertyService { public List getMaterialProperty() { MaterialPropertyExample example = new MaterialPropertyExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return materialPropertyMapper.selectByExample(example); } + public List select(String name, int offset, int rows) { return materialPropertyMapperEx.selectByConditionMaterialProperty(name, offset, rows); } diff --git a/src/main/java/com/jsh/erp/service/person/PersonService.java b/src/main/java/com/jsh/erp/service/person/PersonService.java index cf613b29..12a36f41 100644 --- a/src/main/java/com/jsh/erp/service/person/PersonService.java +++ b/src/main/java/com/jsh/erp/service/person/PersonService.java @@ -49,6 +49,7 @@ public class PersonService { public List getPerson() { PersonExample example = new PersonExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return personMapper.selectByExample(example); } @@ -96,7 +97,7 @@ public class PersonService { public String getPersonByIds(String personIDs) { List ids = StringUtil.strToLongList(personIDs); PersonExample example = new PersonExample(); - example.createCriteria().andIdIn(ids); + example.createCriteria().andIdIn(ids).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Id asc"); List list = personMapper.selectByExample(example); StringBuffer sb = new StringBuffer(); @@ -110,7 +111,7 @@ public class PersonService { public List getPersonByType(String type) { PersonExample example = new PersonExample(); - example.createCriteria().andTypeEqualTo(type); + example.createCriteria().andTypeEqualTo(type).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("Id asc"); return personMapper.selectByExample(example); } diff --git a/src/main/java/com/jsh/erp/service/role/RoleService.java b/src/main/java/com/jsh/erp/service/role/RoleService.java index e98bce8c..6fa3bb2d 100644 --- a/src/main/java/com/jsh/erp/service/role/RoleService.java +++ b/src/main/java/com/jsh/erp/service/role/RoleService.java @@ -43,6 +43,7 @@ public class RoleService { public List getRole() { RoleExample example = new RoleExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return roleMapper.selectByExample(example); } diff --git a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java index 24f06105..99db9ed6 100644 --- a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java +++ b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java @@ -53,6 +53,7 @@ public class SupplierService { public List getSupplier() { SupplierExample example = new SupplierExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return supplierMapper.selectByExample(example); } @@ -114,28 +115,31 @@ public class SupplierService { public List findBySelectCus() { SupplierExample example = new SupplierExample(); - example.createCriteria().andTypeLike("客户").andEnabledEqualTo(true); + example.createCriteria().andTypeLike("客户").andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("id desc"); return supplierMapper.selectByExample(example); } public List findBySelectSup() { SupplierExample example = new SupplierExample(); - example.createCriteria().andTypeLike("供应商").andEnabledEqualTo(true); + example.createCriteria().andTypeLike("供应商").andEnabledEqualTo(true) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("id desc"); return supplierMapper.selectByExample(example); } public List findBySelectRetail() { SupplierExample example = new SupplierExample(); - example.createCriteria().andTypeLike("会员").andEnabledEqualTo(true); + example.createCriteria().andTypeLike("会员").andEnabledEqualTo(true) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("id desc"); return supplierMapper.selectByExample(example); } public List findById(Long supplierId) { SupplierExample example = new SupplierExample(); - example.createCriteria().andIdEqualTo(supplierId); + example.createCriteria().andIdEqualTo(supplierId) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("id desc"); return supplierMapper.selectByExample(example); } @@ -155,7 +159,8 @@ public class SupplierService { public List findUserCustomer(){ SupplierExample example = new SupplierExample(); - example.createCriteria().andTypeEqualTo("客户"); + example.createCriteria().andTypeEqualTo("客户") + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.setOrderByClause("id desc"); List list = supplierMapper.selectByExample(example); return list; diff --git a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java index 696d8c3b..b4ed6c6f 100644 --- a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java +++ b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java @@ -42,6 +42,7 @@ public class SystemConfigService { public List getSystemConfig() { SystemConfigExample example = new SystemConfigExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return systemConfigMapper.selectByExample(example); } public List select(String companyName, int offset, int rows) { @@ -84,6 +85,7 @@ public class SystemConfigService { List list = systemConfigMapper.selectByExample(example); return list.size(); } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int batchDeleteSystemConfigByIds(String ids) { logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_SYSTEM_CONFIG, diff --git a/src/main/java/com/jsh/erp/service/unit/UnitService.java b/src/main/java/com/jsh/erp/service/unit/UnitService.java index 65a7b0dc..d15e49bd 100644 --- a/src/main/java/com/jsh/erp/service/unit/UnitService.java +++ b/src/main/java/com/jsh/erp/service/unit/UnitService.java @@ -49,6 +49,7 @@ public class UnitService { public List getUnit() { UnitExample example = new UnitExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return unitMapper.selectByExample(example); } diff --git a/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java b/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java index 3e9c3e92..9c07a555 100644 --- a/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java +++ b/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java @@ -59,6 +59,7 @@ public class UserBusinessService { public List getUserBusiness() { UserBusinessExample example = new UserBusinessExample(); + example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); return userBusinessMapper.selectByExample(example); } @@ -104,14 +105,16 @@ public class UserBusinessService { public List getBasicData(String keyId, String type){ UserBusinessExample example = new UserBusinessExample(); - example.createCriteria().andKeyidEqualTo(keyId).andTypeEqualTo(type); + example.createCriteria().andKeyidEqualTo(keyId).andTypeEqualTo(type) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); List list = userBusinessMapper.selectByExample(example); return list; } public Long checkIsValueExist(String type, String keyId) { UserBusinessExample example = new UserBusinessExample(); - example.createCriteria().andTypeEqualTo(type).andKeyidEqualTo(keyId); + example.createCriteria().andTypeEqualTo(type).andKeyidEqualTo(keyId) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); List list = userBusinessMapper.selectByExample(example); Long id = null; if(list.size() > 0) { @@ -124,9 +127,11 @@ public class UserBusinessService { UserBusinessExample example = new UserBusinessExample(); String newVaule = "%" + UBValue + "%"; if(TypeVale !=null && KeyIdValue !=null) { - example.createCriteria().andTypeEqualTo(TypeVale).andKeyidEqualTo(KeyIdValue).andValueLike(newVaule); + example.createCriteria().andTypeEqualTo(TypeVale).andKeyidEqualTo(KeyIdValue).andValueLike(newVaule) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } else { - example.createCriteria().andValueLike(newVaule); + example.createCriteria().andValueLike(newVaule) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } List list = userBusinessMapper.selectByExample(example); if(list.size() > 0) { @@ -150,7 +155,8 @@ public class UserBusinessService { public List findRoleByUserId(String userId){ UserBusinessExample example = new UserBusinessExample(); - example.createCriteria().andKeyidEqualTo(userId).andTypeEqualTo("UserRole"); + example.createCriteria().andKeyidEqualTo(userId).andTypeEqualTo("UserRole") + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); List list = userBusinessMapper.selectByExample(example); return list; } @@ -158,10 +164,12 @@ public class UserBusinessService { public List findAppByRoles(String roles){ List rolesList = StringUtil.strToStringList(roles); UserBusinessExample example = new UserBusinessExample(); - example.createCriteria().andKeyidIn(rolesList).andTypeEqualTo("RoleAPP"); + example.createCriteria().andKeyidIn(rolesList).andTypeEqualTo("RoleAPP") + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); List list = userBusinessMapper.selectByExample(example); return list; } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int batchDeleteUserBusinessByIds(String ids) { logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER_BUSINESS,