From 518799fb8c1739c3b75c63eb0309bb3dd94016e7 Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Fri, 14 Dec 2018 14:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/busi/SysLocaleResourceService.java     | 18 +++++++++---------
 .../apiservice/serviceimpl/busi/SysUserService.java    |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java
index ae7f1d8..2362109 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java
@@ -65,15 +65,15 @@ public class SysLocaleResourceService implements ISysLocaleResourceService {
     @Override
     public void updateSysLocaleResource(SysLocaleResource sysLocaleResource) {
         LOGGER.info("系统资源 SYS_LOCALE_RESOURCE SysLocaleResource：{}",sysLocaleResource);
-        String hqlPack = CoreHqlPack.packHqlSysLocaleResourceKey(sysLocaleResource);
-        int count = sysLocaleResourceRDao.findByHqlWhereCount(hqlPack);
-        if (count > 0){
-            throw ImppExceptionBuilder.newInstance()
-                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
-                    .setErrorDetail("语言资源已存在")
-                    .setErrorSolution("请重新输入语言代码与资源键")
-                    .build();
+            String hqlPack = CoreHqlPack.packHqlSysLocaleResourceKey(sysLocaleResource);
+            int count = sysLocaleResourceRDao.findByHqlWhereCount(hqlPack);
+            if (count > 0){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                        .setErrorDetail("语言资源已存在")
+                        .setErrorSolution("请重新输入语言代码与资源键")
+                        .build();
         }
 
         // 设置语言名称冗余
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
index 31a6c6e..590d7a4 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
@@ -140,8 +140,8 @@ public class SysUserService implements ISysUserService {
         LOGGER.debug("平台用户 SYS_USER Override:{} password:{} newPwd:{}", userId,password,newPwd);
         SysUser user = sysUserRDao.getById(userId);
         if(user != null){
-            String md5 = EncryptTool.hexMD5(password);
-            if(md5.equals(user.getUserLoginPassword())){
+            String pwdMd5 = EncryptTool.hexMD5(password);
+            if(pwdMd5.equals(user.getUserLoginPassword())){
                 user.setUserLoginPassword(EncryptTool.hexMD5(newPwd));
                 sysUserRDao.save(user);
             }else {
@@ -334,7 +334,7 @@ public class SysUserService implements ISysUserService {
     @Override
     @ApiOperation(value = "检查-账号登录名", notes = "判断账号是否存在")
     public boolean checkSysUserLoginName(String userLoginName, long id) {
-        int count;
+        int count = 0;
         if(id > 0){
             StringBuffer sw = new StringBuffer();
             HqlPack.getStringEqualPack(userLoginName,"userLoginName",sw);