瀏覽代碼

string compare error fix

shjung 3 年之前
父節點
當前提交
c3c99cebd5

+ 2 - 2
src/main/java/com/its/op/controller/its/cctv/CctvControlController.java

@@ -35,7 +35,7 @@ public class CctvControlController {
             HttpServletRequest request) {
         String userId = this.loginController.getSessionUserId(request);
         log.info("UUID: {}", userId);
-        if (userId != "") {
+        if (!userId.equals("")) {
             req.setUserId(userId);
         }
         return this.service.controlPtz(id, req);
@@ -51,7 +51,7 @@ public class CctvControlController {
             HttpServletRequest request) {
         String userId = this.loginController.getSessionUserId(request);
         log.info("UUID: {}", userId);
-        if (userId != "") {
+        if (!userId.equals("")) {
             req.setUserId(userId);
         }
         return this.service.controlPreset(id, req);

+ 2 - 2
src/main/java/com/its/op/controller/its/vds/VdsControlController.java

@@ -35,7 +35,7 @@ public class VdsControlController {
             HttpServletRequest request) {
         String userId = this.loginController.getSessionUserId(request);
         log.info("UUID: {}", userId);
-        if (userId != "") {
+        if (!userId.equals("")) {
             req.setUserId(userId);
         }
         return this.service.controlReset(id, req);
@@ -51,7 +51,7 @@ public class VdsControlController {
             HttpServletRequest request) {
         String userId = this.loginController.getSessionUserId(request);
         log.info("UUID: {}", userId);
-        if (userId != "") {
+        if (!userId.equals("")) {
             req.setUserId(userId);
         }
         if (req.getFrameNo() != 0) {

+ 5 - 5
src/main/java/com/its/op/controller/its/vms/VmsControlController.java

@@ -35,7 +35,7 @@ public class VmsControlController {
             HttpServletRequest request) {
         String userId = this.loginController.getSessionUserId(request);
         log.info("UUID: {}", userId);
-        if (userId != "") {
+        if (!userId.equals("")) {
             req.setUserId(userId);
         }
         return this.service.controlReset(id, req);
@@ -51,7 +51,7 @@ public class VmsControlController {
             HttpServletRequest request) {
         String userId = this.loginController.getSessionUserId(request);
         log.info("UUID: {}", userId);
-        if (userId != "") {
+        if (!userId.equals("")) {
             req.setUserId(userId);
         }
         return this.service.controlPower(id, req);
@@ -67,7 +67,7 @@ public class VmsControlController {
             HttpServletRequest request) {
         String userId = this.loginController.getSessionUserId(request);
         log.info("UUID: {}", userId);
-        if (userId != "") {
+        if (!userId.equals("")) {
             req.setUserId(userId);
         }
         return this.service.controlLuminance(id, req);
@@ -83,7 +83,7 @@ public class VmsControlController {
             HttpServletRequest request) {
         String userId = this.loginController.getSessionUserId(request);
         log.info("UUID: {}", userId);
-        if (userId != "") {
+        if (!userId.equals("")) {
             req.setUserId(userId);
         }
         return this.service.controlParam(id, req);
@@ -109,7 +109,7 @@ public class VmsControlController {
             HttpServletRequest request) {
         String userId = this.loginController.getSessionUserId(request);
         log.info("UUID: {}", userId);
-        if (userId != "") {
+        if (!userId.equals("")) {
             req.setUserId(userId);
         }
         return this.service.controlOprMode(id, req);

+ 1 - 1
src/main/java/com/its/op/entity/its/oper/TbMsWebMember.java

@@ -117,7 +117,7 @@ public class TbMsWebMember implements Serializable {
     }
 
     public void setPassword(String password) {
-        if (this.password != password) {
+        if (!this.password.equals(password)) {
             this.password = encodePassword(password);
         }
     }