Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ArchiveFileServiceImpl.java

@@ -166,8 +166,12 @@ public class ArchiveFileServiceImpl extends BaseServiceImpl<ArchiveFileMapper, A
         }
         for (ArchiveFile vo : list) {
             // 修改所有的认证状态，如果是不需要认证就设置为已认证，如果是需要认证就设置为未认证
-            if (Func.isNotEmpty(vo.getIsNeedCertification()) && vo.getIsNeedCertification() == 0){
-                vo.setIsCertification(1);
+            if (Func.isNotEmpty(vo.getIsNeedCertification())){
+                if (vo.getIsNeedCertification() == 0) {
+                    vo.setIsCertification(1);
+                } else if (vo.getIsNeedCertification() == 1) {
+                    vo.setIsCertification(0);
+                }
             }
             //循环查看是否把需要审批改为不需要审批，  不可能把不需要审批改为需要审批 ,0不需要，1需要
             if (vo.getStatus() == 0 && vo.getIsApproval() == 0) {

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVDataServiceImpl.java

@@ -560,7 +560,7 @@ public class EVDataServiceImpl implements EVDataService {
                     }
                 }
                 if (signIds.length() > 0 && task.getSigType() != 2) {
-                    String sql = "SELECT * from ( SELECT a.conf_id as keyWord,a.project_id,a.pyzbx ,a.pyzby,(SELECT acc_code from blade_user where id = " + strArray[i] + " and is_deleted=0  ) as sealId " +
+                    String sql = "SELECT * from ( SELECT a.conf_id as keyWord,0.0 as pyzbx ,0.0 as pyzby,(SELECT acc_code from blade_user where id = " + strArray[i] + " and is_deleted=0  ) as sealId " +
                             "from m_sign_config_relation a where a.type = 1 and a.is_deleted = 0 and a.conf_id in (" + signIds + ") " +
                             "and a.relation_id in (SELECT DISTINCT c.role_id from m_project_assignment_user c  where c.contract_id= " + task.getContractId() + " and user_id= " + strArray[i] + " and c.is_deleted=0 ) ) x where x.sealId is not null ";
                     List<Map<String, Object>> maps3 = jdbcTemplate.queryForList(sql);

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -276,6 +276,7 @@
         id,
         parent_id,
         contract_id,
+        project_id,
         node_name AS title,
         id AS "value",
         id AS "key",
@@ -298,7 +299,8 @@
         archive_auto_group_id,
         from_id,
         tree_sort,
-        tree_code
+        tree_code,
+        tree_code as code
         FROM m_archive_tree_contract
         WHERE is_deleted = 0 and project_id = #{projectId}
         <if test=" tenantId!=null and tenantId!='' ">