Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/aspect/DaoAspect.java

@@ -60,7 +60,7 @@ public class DaoAspect {
                 }
                 Long userId = LoginUserHolder.getUserId();
                 objs.forEach(obj -> {
-                    if (isProperty(obj, UPDATE_BY) && userId != null) {
+                    if (isProperty(obj, UPDATE_BY) && !userId.equals(1L)) {
                         BeanUtils.setProperty(obj, UPDATE_BY, userId);
                     }
                     if (isProperty(obj, UPDATE_TIME)) {
@@ -89,9 +89,6 @@ public class DaoAspect {
                 Date date = new Date();
                 objs.forEach(obj -> {
                     Long userId = LoginUserHolder.getUserId();
-                    if (userId == null) {
-                        userId = 1L;
-                    }
                     if (isProperty(obj, CREATE_BY) && Objects.isNull(BeanUtils.getProperty(obj, CREATE_BY))) {
                         BeanUtils.setProperty(obj, CREATE_BY, userId);
                     }