优化账户/仓库/经手人等模块的排序

jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java

@@ -74,10 +74,11 @@ public class AccountService {
     }
 
     public List<Account> getAccount() throws Exception{
-        AccountExample example = new AccountExample();
-        example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
         List<Account> list=null;
         try{
+            AccountExample example = new AccountExample();
+            example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+            example.setOrderByClause("sort asc, id desc");
             list=accountMapper.selectByExample(example);
         }catch(Exception e){
             JshException.readFail(logger, e);
@@ -251,7 +252,7 @@ public class AccountService {
     public List<Account> findBySelect()throws Exception {
         AccountExample example = new AccountExample();
         example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("id desc");
+        example.setOrderByClause("sort asc, id desc");
         List<Account> list=null;
         try{
             list = accountMapper.selectByExample(example);

jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java

@@ -89,7 +89,7 @@ public class DepotService {
     public List<Depot> getAllList()throws Exception {
         DepotExample example = new DepotExample();
         example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("sort");
+        example.setOrderByClause("sort asc, id desc");
         List<Depot> list=null;
         try{
             list=depotMapper.selectByExample(example);
@@ -232,7 +232,7 @@ public class DepotService {
         DepotExample example = new DepotExample();
         example.createCriteria().andTypeEqualTo(0).andEnabledEqualTo(true)
                 .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("sort");
+        example.setOrderByClause("sort asc, id desc");
         List<Depot> list=null;
         try{
             list= depotMapper.selectByExample(example);

jshERP-boot/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java

@@ -195,7 +195,7 @@ public class InOutItemService {
             example.createCriteria().andTypeEqualTo("支出").andEnabledEqualTo(true)
                     .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
         }
-        example.setOrderByClause("id desc");
+        example.setOrderByClause("sort asc, id desc");
         List<InOutItem> list = null;
         try{
             list=inOutItemMapper.selectByExample(example);

jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonService.java

@@ -224,7 +224,7 @@ public class PersonService {
         PersonExample example = new PersonExample();
         example.createCriteria().andTypeEqualTo(type).andEnabledEqualTo(true)
                 .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("id asc");
+        example.setOrderByClause("sort asc, id desc");
         List<Person> list =null;
         try{
             list=personMapper.selectByExample(example);

jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java

@@ -63,6 +63,7 @@ public class RoleService {
     public List<Role> allList()throws Exception {
         RoleExample example = new RoleExample();
         example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        example.setOrderByClause("sort asc, id desc");
         List<Role> list=null;
         try{
             list=roleMapper.selectByExample(example);

jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java

@@ -307,7 +307,7 @@ public class SupplierService {
     public List<Supplier> findBySelectCus()throws Exception {
         SupplierExample example = new SupplierExample();
         example.createCriteria().andTypeLike("客户").andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("id desc");
+        example.setOrderByClause("sort asc, id desc");
         List<Supplier> list=null;
         try{
             list = supplierMapper.selectByExample(example);
@@ -321,7 +321,7 @@ public class SupplierService {
         SupplierExample example = new SupplierExample();
         example.createCriteria().andTypeLike("供应商").andEnabledEqualTo(true)
                 .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("id desc");
+        example.setOrderByClause("sort asc, id desc");
         List<Supplier> list=null;
         try{
             list = supplierMapper.selectByExample(example);
@@ -335,7 +335,7 @@ public class SupplierService {
         SupplierExample example = new SupplierExample();
         example.createCriteria().andTypeLike("会员").andEnabledEqualTo(true)
                 .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("id desc");
+        example.setOrderByClause("sort asc, id desc");
         List<Supplier> list=null;
         try{
             list = supplierMapper.selectByExample(example);
@@ -349,7 +349,7 @@ public class SupplierService {
         SupplierExample example = new SupplierExample();
         example.createCriteria().andIdEqualTo(supplierId)
                 .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("id desc");
+        example.setOrderByClause("sort asc, id desc");
         List<Supplier> list=null;
         try{
             list = supplierMapper.selectByExample(example);
@@ -382,7 +382,7 @@ public class SupplierService {
         SupplierExample example = new SupplierExample();
         example.createCriteria().andTypeEqualTo("客户")
                 .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("id desc");
+        example.setOrderByClause("sort asc, id desc");
         List<Supplier> list=null;
         try{
             list = supplierMapper.selectByExample(example);

jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml

@@ -69,7 +69,7 @@
             and telephone like #{bindTelephone}
         </if>
         and ifnull(delete_flag,'0') !='1'
-        order by id desc
+        order by sort asc, id desc
     </select>
 
     <update id="batchDeleteSupplierByIds">