补充用户默认值

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/aspect/DEFieldDefaultValueAspect.java.ftl

@@ -30,6 +30,16 @@ import java.util.Map;
 @Component
 public class DEFieldDefaultValueAspect
 {
+    /**
+     * 操作用户标识
+     */
+    final static String TAG_PERSONID = "SRF_PERSONID";
+
+    /**
+     * 操作用户名称
+     */
+    final static String TAG_PERSONNAME = "SRF_PERSONNAME";
+
     /**
      * 新建数据切入点
      * @param point
@@ -224,16 +234,16 @@ public class DEFieldDefaultValueAspect
 
             switch(preFieldType) {
                 case CREATEMAN:
-                    et.set(fieldname, getUserId(curUser, et));
+                    et.set(fieldname, StringUtils.isEmpty(curUser.getUserid()) ? et.get(TAG_PERSONID) : curUser.getUserid());
                     break;
                 case CREATEMANNAME:
-                    et.set(fieldname, getUserName(curUser, et));
+                    et.set(fieldname, StringUtils.isEmpty(curUser.getPersonname()) ? et.get(TAG_PERSONNAME) : curUser.getPersonname());
                     break;
                 case UPDATEMAN:
-                    et.set(fieldname, getUserId(curUser, et));
+                    et.set(fieldname, StringUtils.isEmpty(curUser.getUserid()) ? et.get(TAG_PERSONID) : curUser.getUserid());
                     break;
                 case UPDATEMANNAME:
-                    et.set(fieldname, getUserName(curUser, et));
+                    et.set(fieldname, StringUtils.isEmpty(curUser.getPersonname()) ? et.get(TAG_PERSONNAME) : curUser.getPersonname());
                     break;
                 case CREATEDATE:
                     et.set(fieldname, new Timestamp(new Date().getTime()));
@@ -271,34 +281,4 @@ public class DEFieldDefaultValueAspect
         }
     }
 
-    /**
-     * 获取当前登录用户标识
-     *
-     * @param curUser
-     * @param et
-     * @return
-     */
-    private String getUserId(AuthenticationUser curUser, EntityBase et) {
-        String userId = StringUtils.isEmpty(curUser.getUserid()) ? DataObject.getStringValue(et.get(TAG_PERSONID), null) : curUser.getUserid();
-        if (StringUtils.isEmpty(userId)) {
-            userId = "ibzadmin";
-        }
-        return userId;
-    }
-
-    /**
-     * 获取当前登录用户名称
-     *
-     * @param curUser
-     * @param et
-     * @return
-     */
-    private String getUserName(AuthenticationUser curUser, EntityBase et) {
-        String userName = StringUtils.isEmpty(curUser.getPersonname()) ? DataObject.getStringValue(et.get(TAG_PERSONNAME), null) : curUser.getPersonname();
-        if (StringUtils.isEmpty(userName)) {
-            userName = "系统管理员";
-        }
-        return userName;
-    }
-
 }