فهرست منبع

Long类型比较相等问题调整

RuoYi 5 سال پیش
والد
کامیت
e476fe6f5d

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -192,7 +192,7 @@ public class SysUserController extends BaseController
         user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
         if (userService.resetUserPwd(user) > 0)
         {
-            if (ShiroUtils.getUserId() == user.getUserId())
+            if (ShiroUtils.getUserId().longValue() == user.getUserId().longValue())
             {
                 ShiroUtils.setSysUser(userService.selectUserById(user.getUserId()));
             }

+ 3 - 3
ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -1,5 +1,8 @@
 package ${packageName}.domain;
 
+#foreach ($import in $importList)
+import ${import};
+#end
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -8,9 +11,6 @@ import com.ruoyi.common.core.domain.BaseEntity;
 #elseif($table.tree)
 import com.ruoyi.common.core.domain.TreeEntity;
 #end
-#foreach ($import in $importList)
-import ${import};
-#end
 
 /**
  * ${functionName}对象 ${tableName}