fangcheng / regional-platform

Download as
Browse Code »

Commit 0eb8847e19f44a72742bf4e2785310d0d8c2b02c

Authored by jiangjiazhi
2 parents 175b679797 a57775b368
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java View file @ 0eb8847
... ... @@ -5,6 +5,7 @@
5 5  
6 6 import com.lyms.platform.biz.param.AssayConfigQuery;
7 7 import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.data.domain.Sort;
8 9 import org.springframework.stereotype.Service;
9 10  
10 11 import com.lyms.platform.biz.dal.AssayConfigDao;
... ... @@ -45,7 +46,7 @@
45 46 mongoQuery.start(assayConfigRequest.getOffset()).end(assayConfigRequest.getLimit());
46 47 }
47 48  
48   - return assayConfigDao.query(mongoQuery);
  49 + return assayConfigDao.query(mongoQuery.addOrder(Sort.Direction.DESC, "modifiedDate"));
49 50 }
50 51  
51 52  
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java View file @ 0eb8847
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.enums.YnEnums;
9 9 import com.lyms.platform.pojo.CommunityConfig;
10 10 import org.springframework.beans.factory.annotation.Autowired;
  11 +import org.springframework.data.domain.Sort;
11 12 import org.springframework.stereotype.Service;
12 13  
13 14 import javax.swing.plaf.synth.Region;
... ... @@ -56,7 +57,7 @@
56 57 mongoQuery.start(communityQuery.getOffset()).end(communityQuery.getLimit());
57 58 }
58 59  
59   - return communityConfigDao.queryArea(mongoQuery);
  60 + return communityConfigDao.queryArea(mongoQuery.addOrder(Sort.Direction.DESC, "modifiedDate"));
60 61 }
61 62  
62 63  
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java View file @ 0eb8847
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.common.dao.operator.MongoQuery;
7 7 import com.lyms.platform.common.utils.SystemConfig;
8 8 import org.springframework.beans.factory.annotation.Autowired;
  9 +import org.springframework.data.domain.Sort;
9 10 import org.springframework.stereotype.Service;
10 11  
11 12 import com.lyms.platform.biz.dal.ReferConfigDao;
... ... @@ -28,7 +29,7 @@
28 29 referConfigQuery.setNeed("true");
29 30 if(null != referConfigQuery.getNeed()) {
30 31 referConfigQuery.mysqlBuild((int) referConfigDao.queryCount(mongoQuery));
31   - mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit());
  32 + mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit()).addOrder(Sort.Direction.DESC, "name");
32 33 }
33 34  
34 35 return referConfigDao.queryRefer(mongoQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 0eb8847
... ... @@ -80,6 +80,9 @@
80 80 String[] roleArrayIds = ids.split(",");
81 81 stopWatch.start("permissionsService.getPermissions by id");
82 82 for (String tmp : roleArrayIds) {
  83 +
  84 +
  85 +
83 86 Permissions permissions = permissionsService.getPermissions(Integer.valueOf(tmp));
84 87 //权限是否存在
85 88 if (permissions == null || permissions.getYn() == YnEnums.NO.getId()) {