diff --git a/application/icec-admin/pom.xml b/application/icec-admin/pom.xml index b4cd262b6b24edfca9890bd1ef9c5bebd4725871..2ecfd848013c57b4b007f11e752ec5bb3dee873c 100644 --- a/application/icec-admin/pom.xml +++ b/application/icec-admin/pom.xml @@ -5,7 +5,7 @@ org.icec icec-parent - 2.1.1 + 2.2.1 icec-admin diff --git a/module/icec-fileManager/pom.xml b/module/icec-fileManager/pom.xml index 6af77184dc9b6f7f1fb211e345a2d6c6329f2ec9..8f1836e828eefc4226bfd82dbddaaf8cf400beaa 100644 --- a/module/icec-fileManager/pom.xml +++ b/module/icec-fileManager/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 icec-module-filemanager - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT org.icec icec-parent - 2.1.1 + 2.2.1 @@ -18,12 +18,12 @@ 1.7.21 1.1.7 6.9.10 - 2.4 + 2.11.0 1.10 - 1.3.1 - 1.11 + 1.4 + 1.21 2.9.3 - 1.12 + 2.1.0 0.8.6 @@ -87,7 +87,7 @@ org.icec icec-sys - 2.1.1 + 2.2.1 diff --git a/module/icec-fileManager/src/main/java/org/icec/filemanager/elfinder/command/AbstractCommand.java b/module/icec-fileManager/src/main/java/org/icec/filemanager/elfinder/command/AbstractCommand.java index 057fef92b872426d8ddbc2fd5b2a5ce247d2487a..d43ece5e85246bb162942c05515b212f01f62530 100644 --- a/module/icec-fileManager/src/main/java/org/icec/filemanager/elfinder/command/AbstractCommand.java +++ b/module/icec-fileManager/src/main/java/org/icec/filemanager/elfinder/command/AbstractCommand.java @@ -137,8 +137,10 @@ public abstract class AbstractCommand implements ElfinderCommand { cwd = findTarget(elfinderStorage, target); } - if (cwd == null) + if (cwd == null){ cwd = new VolumeHandler(elfinderStorage.getVolumes().get(0).getRoot(), elfinderStorage); + } + return cwd; } @@ -156,8 +158,10 @@ public abstract class AbstractCommand implements ElfinderCommand { List targets = new ArrayList<>(targetHashes.length); for (String targetHash : targetHashes) { Target target = elfinderStorage.fromHash(targetHash); - if (target != null) + if (target != null){ targets.add(target); + } + } return targets; } diff --git a/module/icec-fileManager/src/main/java/org/icec/filemanager/elfinder/service/VolumeSources.java b/module/icec-fileManager/src/main/java/org/icec/filemanager/elfinder/service/VolumeSources.java index 57a7ca75c11cd106d606bac6c1e4f417b67114b3..12ba01a6b32b3ad3553148216b0810c0049cd9ca 100644 --- a/module/icec-fileManager/src/main/java/org/icec/filemanager/elfinder/service/VolumeSources.java +++ b/module/icec-fileManager/src/main/java/org/icec/filemanager/elfinder/service/VolumeSources.java @@ -84,8 +84,10 @@ public enum VolumeSources { } public Volume newInstance(String alias, String path) { - if (path == null || path.trim().isEmpty()) + if (path == null || path.trim().isEmpty()){ throw new VolumeSourceException("Volume source path not informed"); + } + return getVolumeBuilder(alias, path).build(); } diff --git a/module/icec-fileManager/src/main/java/org/icec/filemanager/web/controller/ElfinderController.java b/module/icec-fileManager/src/main/java/org/icec/filemanager/web/controller/ElfinderController.java index d4986d62f8726b5574ec44875c07232c930ffdb7..2762e4ac2e2073828b16cd563d554dc628bd57db 100644 --- a/module/icec-fileManager/src/main/java/org/icec/filemanager/web/controller/ElfinderController.java +++ b/module/icec-fileManager/src/main/java/org/icec/filemanager/web/controller/ElfinderController.java @@ -82,8 +82,10 @@ public class ElfinderController { } private HttpServletRequest processMultipartContent(final HttpServletRequest request) throws Exception { - if (!ServletFileUpload.isMultipartContent(request)) + if (!ServletFileUpload.isMultipartContent(request)){ return request; + } + Map map = request.getParameterMap(); diff --git a/module/icec-ireport/pom.xml b/module/icec-ireport/pom.xml index a8299012698c1d73c44f86cc666cc5a7bd23d1da..b0f366d673174cd9513dd42c5633921e400a5475 100644 --- a/module/icec-ireport/pom.xml +++ b/module/icec-ireport/pom.xml @@ -5,7 +5,7 @@ org.icec icec-parent - 2.1 + 2.2.1 icec-ireport @@ -33,7 +33,7 @@ com.itextpdf itextpdf - 5.5.0 + 5.5.13.2 com.itextpdf diff --git a/module/icec-jimureport/pom.xml b/module/icec-jimureport/pom.xml index 867faf7d5b5ee0dd8afdae3db820a7184ccaad50..8c6658fb0eb64eea80deb8d7c60935f0e6e61862 100644 --- a/module/icec-jimureport/pom.xml +++ b/module/icec-jimureport/pom.xml @@ -1,19 +1,18 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.icec icec-parent - 2.1.1 + 2.2.1 icec-jimureport - com.jimureport - spring-boot-starter-jimureport - 1.1-beta + org.jeecgframework.jimureport + jimureport-spring-boot-starter + 1.3.8-beta com.alibaba @@ -36,7 +35,7 @@ org.icec icec-common - 2.1.1 + 2.2.1 org.projectlombok diff --git a/module/icec-jimureport/src/main/java/org/jeecg/modules/jmreport/desreport/service/a/JmReportMapService.java b/module/icec-jimureport/src/main/java/org/jeecg/modules/jmreport/desreport/service/a/JmReportMapService.java index a4a35703c8218c8a517c44932e804a2c797806f2..c05e847b29f6343dcc588dc29a9f26d3fe22e41b 100644 --- a/module/icec-jimureport/src/main/java/org/jeecg/modules/jmreport/desreport/service/a/JmReportMapService.java +++ b/module/icec-jimureport/src/main/java/org/jeecg/modules/jmreport/desreport/service/a/JmReportMapService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.jmreport.desreport.service.a; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +/* import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.jmreport.desreport.entity.JmReportMap; import org.jeecg.modules.jmreport.desreport.mapper.JmReportMapMapper; import org.jeecg.modules.jmreport.desreport.service.IJmReportMapService; @@ -17,4 +17,4 @@ public class JmReportMapService extends ServiceImpl org.icec icec-parent - 2.1.1 + 2.2.1 icec-mybatis-demo @@ -25,7 +25,7 @@ org.icec icec-common - 2.1.1 + 2.2.1 org.projectlombok diff --git a/module/icec-oa/pom.xml b/module/icec-oa/pom.xml index 40c6c4efa4d0d17ceb11a1ab91fa1810ac0bc157..97885c2f905501deaacb613f58c2efa066f20c87 100644 --- a/module/icec-oa/pom.xml +++ b/module/icec-oa/pom.xml @@ -3,7 +3,7 @@ org.icec icec-parent - 2.1 + 2.2.1 icec-oa @@ -11,7 +11,7 @@ org.icec icec-workflow - 2.1 + 2.2.1 \ No newline at end of file diff --git a/module/icec-schedule/pom.xml b/module/icec-schedule/pom.xml index 66bf6d99530a8c3a535f56c546e509665b279d18..489ab1c6c4a703e715b745538cb89b0cc315a91e 100644 --- a/module/icec-schedule/pom.xml +++ b/module/icec-schedule/pom.xml @@ -4,7 +4,7 @@ org.icec icec-parent - 2.1 + 2.2.1 icec-schedule @@ -15,7 +15,7 @@ org.quartz-scheduler quartz - 2.2.1 + 2.3.2 org.springframework @@ -33,7 +33,7 @@ org.icec icec-common - 2.1 + 2.2.1 org.apache.shiro diff --git a/module/icec-sms/pom.xml b/module/icec-sms/pom.xml index 582656441d075fa4323df95087caf280a16ef8fd..0b7d910937adb2b4f4399b46f0b628e5cfc56b40 100644 --- a/module/icec-sms/pom.xml +++ b/module/icec-sms/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - 0.0.1-SNAPSHOT + 2.2.1 icec-sms org.icec icec-parent - 2.1 + 2.2.1 @@ -25,7 +25,7 @@ org.icec icec-sys - 2.1.1 + 2.2.1 org.projectlombok diff --git a/module/icec-workflow/pom.xml b/module/icec-workflow/pom.xml index 6df62a15cffc79f7ac879eb4088befc78df729d4..c135e0cddf34f94bbaa5bc848be3ca6cd5cba367 100644 --- a/module/icec-workflow/pom.xml +++ b/module/icec-workflow/pom.xml @@ -4,7 +4,7 @@ org.icec icec-parent - 2.1 + 2.2.1 icec-workflow activiti 工作流配置和实现 @@ -111,7 +111,7 @@ com.google.guava guava - 19.0 + 30.1.1-jre diff --git a/module/icec-workflow/src/main/java/org/icec/web/activiti/core/JsonpCallbackFilter.java b/module/icec-workflow/src/main/java/org/icec/web/activiti/core/JsonpCallbackFilter.java index 5aafc498a96c0741c2ec2ee718919a10855b8c7b..badb6f3912bf3e841522941d9050ae7e0bb7fbe5 100644 --- a/module/icec-workflow/src/main/java/org/icec/web/activiti/core/JsonpCallbackFilter.java +++ b/module/icec-workflow/src/main/java/org/icec/web/activiti/core/JsonpCallbackFilter.java @@ -27,8 +27,10 @@ public class JsonpCallbackFilter implements Filter { Map parms = httpRequest.getParameterMap(); if (parms.containsKey("callback")) { - if (log.isDebugEnabled()) + if (log.isDebugEnabled()){ log.debug("Wrapping response with JSONP callback '" + parms.get("callback")[0] + "'"); + } + OutputStream out = httpResponse.getOutputStream(); diff --git a/module/pom.xml b/module/pom.xml index 0524429d8e04cd2ca4bbaa758b28903c525d6415..77d4009ad958b517e3ae725dc736c7988b6fc3ca 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -7,6 +7,7 @@ + icec-module-filemanager icec-jimureport \ No newline at end of file diff --git a/platform/icec-common/pom.xml b/platform/icec-common/pom.xml index bcf9d67e0bd873f5979dfbbea7e80a28daa3583e..6d38078683c462f25ee1915516ce4e23e09e3d43 100644 --- a/platform/icec-common/pom.xml +++ b/platform/icec-common/pom.xml @@ -5,7 +5,7 @@ org.icec icec-parent - 2.1.1 + 2.2.1 icec-common @@ -22,7 +22,7 @@ commons-io commons-io - 2.4 + 2.11.0 org.mindrot diff --git a/platform/icec-common/src/main/java/org/icec/common/page/Page.java b/platform/icec-common/src/main/java/org/icec/common/page/Page.java index f777f90be254a34c9a0f670f92fa2b072e9e086e..d27307dddaddb83ed97b10c0abbfcc5cd633b13f 100644 --- a/platform/icec-common/src/main/java/org/icec/common/page/Page.java +++ b/platform/icec-common/src/main/java/org/icec/common/page/Page.java @@ -55,7 +55,7 @@ public class Page { if(this.calc){ return ; } - if(totalRow==0) this.totalPage= 1; + if(totalRow==0) {this.totalPage= 1;} else if(totalRow%this.pageSize==0){ this.totalPage = totalRow/this.pageSize; }else{ diff --git a/platform/icec-common/src/main/java/org/icec/common/utils/DateUtils.java b/platform/icec-common/src/main/java/org/icec/common/utils/DateUtils.java index c51ba4da04bf12ce71b727431ef4485b15a0425b..934dbbe08a01daa1442e6d9c8aefe056b54a580b 100644 --- a/platform/icec-common/src/main/java/org/icec/common/utils/DateUtils.java +++ b/platform/icec-common/src/main/java/org/icec/common/utils/DateUtils.java @@ -125,7 +125,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { * @return */ public static long pastDays(Date date) { - long t = new Date().getTime()-date.getTime(); + long t = System.currentTimeMillis()-date.getTime(); return t/(24*60*60*1000); } @@ -135,7 +135,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { * @return */ public static long pastHour(Date date) { - long t = new Date().getTime()-date.getTime(); + long t = System.currentTimeMillis()-date.getTime(); return t/(60*60*1000); } @@ -145,7 +145,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { * @return */ public static long pastMinutes(Date date) { - long t = new Date().getTime()-date.getTime(); + long t = System.currentTimeMillis()-date.getTime(); return t/(60*1000); } @@ -189,7 +189,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { //System.out.println("当前时间是："+new Timestamp(System.currentTimeMillis())); //System.out.println("发布时间是："+df.format(ctime).toString()); String r = ""; - if(ctime==null)return r; + if(ctime==null){return r; } String format="MM-dd HH:mm"; long nowtimelong = System.currentTimeMillis(); diff --git a/platform/icec-parent/pom.xml b/platform/icec-parent/pom.xml index c9406b20b316be8689623aa159371a38f017db22..cefc664f564a84fb33b6266816086c4fdad60057 100644 --- a/platform/icec-parent/pom.xml +++ b/platform/icec-parent/pom.xml @@ -3,25 +3,25 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.icec - 2.1.1 + 2.2.1 icec-parent pom - 2.1.1 + 2.2.1 UTF-8 UTF-8 11 - 3.0.11.RELEASE + 3.0.12.RELEASE 2.2.2 - 3.0.11.RELEASE + 3.0.12.RELEASE 1.4.2 2.6.11 2.3.2 - 1.2.70 - 2.3.0.RELEASE + 1.2.78 + 2.3.12.RELEASE 2.8.1 - 1.2.5 + 1.3.1 3.6.0 4.0.0 @@ -78,7 +78,7 @@ org.postgresql postgresql - 42.2.9 + 42.2.23 diff --git a/platform/icec-static/pom.xml b/platform/icec-static/pom.xml index ca2f72457654edcaff3ff65d1496c0e9e9b7a90e..be9ccb3cea7db4da4decef4fc2943524b7af8006 100644 --- a/platform/icec-static/pom.xml +++ b/platform/icec-static/pom.xml @@ -5,7 +5,7 @@ org.icec icec-parent - 2.1.1 + 2.2.1 icec-static diff --git a/platform/icec-sys/pom.xml b/platform/icec-sys/pom.xml index 0d5ea50482fa2a465fb7720091072352152f63ac..ff8671d4a2aa621304349037ec2abd6f0b6ca0a5 100644 --- a/platform/icec-sys/pom.xml +++ b/platform/icec-sys/pom.xml @@ -5,7 +5,7 @@ org.icec icec-parent - 2.1.1 + 2.2.1 icec-sys diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/shiro/filter/JWTOrFormAuthenticationFilter.java b/platform/icec-sys/src/main/java/org/icec/web/core/shiro/filter/JWTOrFormAuthenticationFilter.java index 0364e379d0376b66843eea3d4b5fae53543b51dc..ecef787ce31b31759df21f7637472c71edb9b56e 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/shiro/filter/JWTOrFormAuthenticationFilter.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/shiro/filter/JWTOrFormAuthenticationFilter.java @@ -182,8 +182,10 @@ public final class JWTOrFormAuthenticationFilter extends AuthenticatingFilter { protected String getAuthzHeader(ServletRequest request) { HttpServletRequest httpRequest = WebUtils.toHttp(request); String paramAuth = httpRequest.getParameter("jtoken"); - if (paramAuth != null) + if (paramAuth != null){ return paramAuth; + } + return httpRequest.getHeader(AUTHORIZATION_HEADER); } diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/shiro/jwt/JwtUtil.java b/platform/icec-sys/src/main/java/org/icec/web/core/shiro/jwt/JwtUtil.java index 40bfa517d2d8b619fe5838bf949ad1f3334bbd20..4dfeb61640d1f77e5fded7ce1a0e7d3d2cd51adf 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/shiro/jwt/JwtUtil.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/shiro/jwt/JwtUtil.java @@ -26,7 +26,7 @@ public class JwtUtil { // default 7 days //@Value("${jwt.expiration:604800}") - private Long expiration=604800l; + private Long expiration=604800L; @Autowired private Environment env; public String generateToken(SysUser user) { diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/shiro/realm/MyFormRealm.java b/platform/icec-sys/src/main/java/org/icec/web/core/shiro/realm/MyFormRealm.java index 55c4a1e0c425f0d7cf31ae9b73e8596d29c377f3..b2eda7c8e0619c7c8d702f1d2ac856ca9f631a18 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/shiro/realm/MyFormRealm.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/shiro/realm/MyFormRealm.java @@ -42,7 +42,7 @@ public class MyFormRealm extends AuthorizingRealm { protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) { UsernamePasswordToken upToken = (UsernamePasswordToken) token; String username = (String)upToken.getPrincipal(); - if(username==null) return null; + if(username==null) {return null;} SysUser user = userRepository.findByUserId(upToken.getUsername()); if (user != null) { diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/shiro/realm/MyJWTRealm.java b/platform/icec-sys/src/main/java/org/icec/web/core/shiro/realm/MyJWTRealm.java index fed662ca068c5035a852707c2f421128cf26ac69..86fe5c6e9da20b43973706b3812f634665aca251 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/shiro/realm/MyJWTRealm.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/shiro/realm/MyJWTRealm.java @@ -45,8 +45,10 @@ public class MyJWTRealm extends AuthorizingRealm { protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) { JWTAuthenticationToken upToken = (JWTAuthenticationToken) token; String userName = jwtUtil.getUsernameFromToken(upToken.getToken()); - if (userName == null) + if (userName == null){ return null; + } + SysUser user = userRepository.findByUserId(userName); if (user != null && jwtUtil.verifyToken(upToken.getToken()) == TokenStatus.VALID) { diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/sys/model/SysUser.java b/platform/icec-sys/src/main/java/org/icec/web/core/sys/model/SysUser.java index bd03a8e76172251fc13906f264dd7a1cc789affb..a070264c12a9cf1801d22abefc3ef46a3999f4e5 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/sys/model/SysUser.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/sys/model/SysUser.java @@ -1,5 +1,5 @@ package org.icec.web.core.sys.model; -import java.math.*; +import java.math.*; import java.util.Date; import org.apache.shiro.authc.AuthenticationToken; @@ -11,7 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; -import java.sql.Timestamp; +import java.sql.Timestamp; /* * @@ -254,18 +254,28 @@ public class SysUser implements BaseModel ,AuthenticationToken{ @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj){ return true; - if (obj == null) + } + + if (obj == null){ return false; - if (getClass() != obj.getClass()) + } + + if (getClass() != obj.getClass()){ return false; + } + SysUser other = (SysUser) obj; if (loginName == null) { - if (other.loginName != null) + if (other.loginName != null){ return false; - } else if (!loginName.equals(other.loginName)) + } + + } else if (!loginName.equals(other.loginName)){ return false; + } + return true; } diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysDictService.java b/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysDictService.java index e5ec90eca2e6bcef950b7053eab299a2cc5ce1c8..48dbe133eb425e505eca8e6fab20df124344a748 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysDictService.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysDictService.java @@ -83,7 +83,7 @@ public class SysDictService { * @return */ public List getDictValue(Integer typeId){ - if(typeId==null)return null; + if(typeId==null){return null;} return sysDictDao.getDictItems(typeId); } /** @@ -93,7 +93,7 @@ public class SysDictService { */ @Cacheable(value=CACHE_DICT_NAME,key="#root.methodName+'_'+#p0") public List getDictByType(String type){ - if(type==null)return null; + if(type==null){return null;} return sysDictDao.getDictItemsByType(type); } /** diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysFileService.java b/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysFileService.java index 9e5ebcb16bb9aa392f925a7a38c9308d6522fc15..d5be9f3e6b1e874c39138ea6b9273ecac70fce0f 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysFileService.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysFileService.java @@ -58,7 +58,7 @@ public class SysFileService { * @return */ public Long saveUploadFile(String type,MultipartFile multiFile,SysUser user) { - if(multiFile==null)return 0l; + if(multiFile==null){return 0L;} String filename = multiFile.getOriginalFilename(); // 得到上传时的文件名 logger.debug("上传的文件名称：{}", filename); diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysGlobalCustomService.java b/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysGlobalCustomService.java index 83b904e51ca07def8a735d976d1c88a18a24f91d..af3b34e1b1513cdb5e7b4e14ba8d823d1e2e67e9 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysGlobalCustomService.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysGlobalCustomService.java @@ -77,7 +77,7 @@ public class SysGlobalCustomService { * @return */ public T findByPrefix(T globalCustom){ - if(globalCustom.getPrefix()==null)return globalCustom; + if(globalCustom.getPrefix()==null){return globalCustom;} List list = sysGlobalCustomDao.createLambdaQuery().andEq(SysGlobalCustom::getfPrefix, globalCustom.getPrefix()).select(); Map customs= new HashMap(); for(SysGlobalCustom e:list) { diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysRoleService.java b/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysRoleService.java index bb12f73051e7d2803bafd6b5dd51617e06d8450d..7651200f55ef06eb4afe6a5b24bf7963af87c6a6 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysRoleService.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysRoleService.java @@ -95,12 +95,12 @@ public class SysRoleService { * @return */ public List getRoleValue(Integer roleTypeId){ - if(roleTypeId==null)return null; + if(roleTypeId==null){return null;} return sysRoleDao.getRoleItems(roleTypeId); } public List queryUnselect(Integer roleTypeId) { - if(roleTypeId==null)return null; + if(roleTypeId==null){return null;} return sysRoleDao.queryUnselect(roleTypeId); } diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysUserService.java b/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysUserService.java index 6686cfd89bdf7afc5d0cd2d2e3d525b95140ea9c..facccddce15235a593ba56c6d51ea5b7e384191d 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysUserService.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/sys/service/SysUserService.java @@ -170,7 +170,7 @@ public class SysUserService { * @return */ public List queryUnselect(Integer roleTypeId,String name,String loginName) { - if(roleTypeId==null)return null; + if(roleTypeId==null){return null;} return userDao.queryUnselect(roleTypeId,name,loginName); } diff --git a/platform/icec-sys/src/main/java/org/icec/web/core/sys/utils/ShiroKit.java b/platform/icec-sys/src/main/java/org/icec/web/core/sys/utils/ShiroKit.java index ce52b369329b4bc0b2d5181d2838cf38089768a2..86c770cc323460684adc8bbb93b7966d82fed900 100644 --- a/platform/icec-sys/src/main/java/org/icec/web/core/sys/utils/ShiroKit.java +++ b/platform/icec-sys/src/main/java/org/icec/web/core/sys/utils/ShiroKit.java @@ -59,8 +59,10 @@ public class ShiroKit { */ public static void removeSessionAttr(String key) { Session session = getSession(); - if (session != null) + if (session != null){ session.removeAttribute(key); + } + } /**