修复huaweiUcPassword字段不序列化的问题

resources/mapper/modules/verify/VerifyFeedbackDao.xml

@@ -373,14 +373,17 @@
                 where f.depart_id=#{userDepartId}
                 and v.verif_id=#{verifId}
                 AND v.depart_id= #{departId}
+                and v.`condition` is not null
                 group by v.id
             </when>
             <otherwise>
                 WHERE v.verif_id = #{verifId}
                 AND v.depart_id = #{departId}
+                and v.`condition` is not null
             </otherwise>
         </choose>
 
+
     </select>
     <!-- 论证条件评估-修改各部门的反馈信息 -->
     <update id="updateFeedback">

src/com/ejweb/core/conf/SecurityPropertyPlaceholderConfigurer.java

@@ -79,6 +79,7 @@ public class SecurityPropertyPlaceholderConfigurer extends PropertyPlaceholderCo
 
     public static void main(String[] args) {
         System.out.println(DES3Utils.encrypt("foctest", CONF_DESC_KEY));
+        System.out.println(DES3Utils.decrypt("dc6788486fc8fa46bdc79e88019874d2dba29c9323df0d41d422c89b73b481946acb4985946fc04c9e83784b79a27bf935e0dbe240259eb88daa2a68d7c26b3c05ef21acf1ec90e77072592f9207bf97", CONF_DESC_KEY));
         System.out.println(DES3Utils.decrypt("776b3d2f912b12f8", CONF_DESC_KEY));
         System.out.println(DES3Utils.decrypt("6f2237c231b1464c6474030c906ec914", CONF_DESC_KEY));
     }

src/com/ejweb/core/utils/excel/ImportExcel.java

@@ -49,17 +49,6 @@ public class ImportExcel {
      */
     private int headerNum;
 
-    /**
-     * 构造函数
-     *
-     * @param path      导入文件，读取第一个工作表
-     * @param headerNum 标题行号，数据行号=标题行号+1
-     * @throws InvalidFormatException
-     * @throws IOException
-     */
-    public ImportExcel(String fileName, int headerNum) throws InvalidFormatException, IOException {
-        this(new File(fileName), headerNum);
-    }
 
     /**
      * 构造函数
@@ -73,18 +62,6 @@ public class ImportExcel {
         this(file, headerNum, 0);
     }
 
-    /**
-     * 构造函数
-     *
-     * @param path       导入文件
-     * @param headerNum  标题行号，数据行号=标题行号+1
-     * @param sheetIndex 工作表编号
-     * @throws InvalidFormatException
-     * @throws IOException
-     */
-    public ImportExcel(String fileName, int headerNum, int sheetIndex) throws InvalidFormatException, IOException {
-        this(new File(fileName), headerNum, sheetIndex);
-    }
 
     /**
      * 构造函数

src/com/ejweb/modules/contact/entity/StationUserListEntity.java

@@ -43,7 +43,7 @@ public class StationUserListEntity extends BaseEntity {
     private String dutyName; // 职务
     private String huaweiNum;
     private String huaweiAccount; //华为账号
-    private transient String huaweiPassword; //华为密码
+    private String huaweiPassword; //华为密码
     
     private int huaweiStatus;// 华为绑定状态： 0 位绑定 1 已绑定
     private int jiewenStatus;// 捷文绑定状态： 0 位绑定 1 已绑定

src/com/ejweb/modules/im/entity/UcAccountEntity.java

@@ -18,7 +18,7 @@ public class UcAccountEntity extends BaseEntity {
     private String bindStatus = "FAILD"; //绑定状态 FAILD 绑定失败 SUCCESS 绑定成功 UNBIND 已解绑
     private String huaweiNum; //华为SIP号
     private String huaweiId; //华为UC账号ID
-    private transient String huaweiPassword; //登录华为密码
+	private String huaweiPassword; //登录华为密码
 	private String updateBy; //最后一次者
     private Date updateDate; //最后一次时间
     private String syncMessage; //同步过程描述

src/com/ejweb/modules/user/entity/LoginUserEntity.java

@@ -35,7 +35,7 @@ public class LoginUserEntity extends BaseEntity {
     private String photo; // 头像
     private String dutyName;// 职务名称
     private String huaweiUCAccount;
-    private transient String huaweiUCPassword;
+    private String huaweiUCPassword;
     private int huaweiStatus;// 华为绑定状态： 0 位绑定 1 已绑定
     private int jiewenStatus;// 捷文绑定状态： 0 位绑定 1 已绑定
     private String sex;

src/com/ejweb/modules/user/entity/User.java

@@ -16,7 +16,7 @@ public class User extends BaseEntity {
 	private Office company; // 归属公司
 	private Office office; // 归属部门
 	private String loginName;// 登录名
-	private transient String password;// 密码
+	private String password;// 密码
 	private String no; // 工号
 	private String name; // 姓名
 	private String email; // 邮箱

src/com/ejweb/modules/user/entity/UserSeatEntity.java

@@ -21,7 +21,7 @@ public class UserSeatEntity extends BaseEntity {
     private String seatHuaweiNum;
     private String stationName;// 席位场站名称
     private String huaweiUCAccount;
-    private transient String huaweiUCPassword;
+    private String huaweiUCPassword;
     private String photo; // 头像
     
     @JSONField(name="userCode")