BUG修改

bi-server/src/main/java/com/usoftchina/bi/server/dao/user/UserMapper.java

@@ -22,7 +22,7 @@ public interface UserMapper {
      * 查询UAS的人员资料表数据
      * @return
      */
-    @Select("SELECT EM_DEFAULTHSNAME as department, EM_TYPE role, EM_DEPART as post, EM_NAME as name, EM_PASSWORD as passWord, "
+    @Select("SELECT EM_ID as id,EM_DEFAULTHSNAME as department, EM_TYPE role, EM_DEPART as post, EM_NAME as name, EM_PASSWORD as passWord, "
             + "EM_MOBILE as phone, EM_CODE as userName,EM_CLASS AS state FROM EMPLOYEE")
     List<User> getUASEmployee();
 
@@ -30,17 +30,18 @@ public interface UserMapper {
      * 批量插入人员资料
      * @param userList
      */
-    @Insert("<script"
+    @Insert("<script>"
             + "INSERT INTO BI_USERS(BU_ID, BU_NAME, BU_POST, USER_NAME, PASS_WORD, BU_DEPARTMENT, CREATE_DATE) "
-            + "SELECT BI_USERS_SEQ.NEXTVAL,M.* FROM ("
+            + "SELECT M.* FROM ("
             +   "<foreach collection=\"list\" item=\"item\" index=\"index\" separator=\"UNION ALL\">"
             +       "SELECT "
-            +           "#{name, jdbcType=VARCHAR},"
-            +           "#{post, jdbcType=VARCHAR},"
-            +           "#{userName, jdbcType=VARCHAR},"
-            +           "#{passWord, jdbcType=VARCHAR},"
-            +           "#{department, jdbcType=VARCHAR},"
-            +           "SYSDATE"
+            +           "#{item.id, jdbcType=INTEGER},"
+            +           "#{item.name, jdbcType=VARCHAR},"
+            +           "#{item.post, jdbcType=VARCHAR},"
+            +           "#{item.userName, jdbcType=VARCHAR},"
+            +           "#{item.passWord, jdbcType=VARCHAR},"
+            +           "#{item.department, jdbcType=VARCHAR},"
+            +           "SYSDATE "
             +       "FROM DUAL"
             +   "</foreach>"
             + ")M"
@@ -66,7 +67,7 @@ public interface UserMapper {
             " <if test=\"post != null\">BU_POST = #{post,jdbcType=VARCHAR}, </if>" +
             " <if test=\"department != null\">BU_DEPARTMENT = #{department,jdbcType=VARCHAR}, </if>" +
             " <if test=\"role != null\">BU_ROLE = #{role,jdbcType=VARCHAR}, </if>" +
-            " <if test=\"phone != null\">BU_ROLE = #{BU_PHONE,jdbcType=VARCHAR}, </if>" +
+            " <if test=\"phone != null\">BU_PHONE = #{phone,jdbcType=VARCHAR}, </if>" +
             "  updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss')" +
             "  where bu_id = #{id,jdbcType=INTEGER}" +
             " </script>")

bi-server/src/main/java/com/usoftchina/bi/server/service/user/SynchronizeEmpInfo.java

@@ -31,7 +31,7 @@ public class SynchronizeEmpInfo {
                        + "  UPDATE  SET TARGETTABLE.BU_CLASS = SOURCETABLE.EM_CLASS, TARGETTABLE.PASS_WORD = SOURCETABLE.EM_PASSWORD, TARGETTABLE.BU_ROLE = SOURCETABLE.EM_TYPE "
                        + "WHEN NOT MATCHED THEN"
                        + "  INSERT (BU_ID,BU_NAME,BU_DEPARTMENT,BU_POST,BU_USER_GROUP,USER_NAME,PASS_WORD,BU_ROLE,CREATE_DATE,UPDATA_DATE,USER_TOKEN,BU_PHONE,BU_CLASS) "
-                       + "  VALUES (BI_USERS_SEQ.NEXTVAL,SOURCETABLE.EM_NAME,SOURCETABLE.EM_DEFAULTHSNAME,SOURCETABLE.EM_DEPART,NULL,SOURCETABLE.EM_CODE,SOURCETABLE.EM_PASSWORD,SOURCETABLE.EM_TYPE,SYSDATE,NULL,NULL,SOURCETABLE.EM_MOBILE,SOURCETABLE.EM_CLASS)";
+                       + "  VALUES (SOURCETABLE.EM_ID,SOURCETABLE.EM_NAME,SOURCETABLE.EM_DEFAULTHSNAME,SOURCETABLE.EM_DEPART,NULL,SOURCETABLE.EM_CODE,SOURCETABLE.EM_PASSWORD,SOURCETABLE.EM_TYPE,SYSDATE,NULL,NULL,SOURCETABLE.EM_MOBILE,SOURCETABLE.EM_CLASS)";
 
     @Scheduled(cron = "0 0 1 * * ?")
     private void syncEmpInfo(){

bi-server/src/main/java/com/usoftchina/bi/server/service/user/UserService.java

@@ -65,7 +65,7 @@ public class UserService {
             user.setRole(role);
             int userId = userMapper.getUserId(userName);
             user.setId(userId);
-            if (!pws.equals(EncryUtil.decryptPassword(password))){
+            if (!pws.equals(password)){
                 //更新密码
                 userMapper.updateUser(user);
             }else {
@@ -106,7 +106,7 @@ public class UserService {
         }
         String password = user.getPassWord();
         String pw = EncryUtil.decryptPassword(password);
-        if (!pws.equals(pw)){
+        if (!EncryUtil.decryptPassword(pws).equals(pw)){
             throw new MyException(RepCode.NoUser);
         }
         return user;