Merge branch 'dev_v1.0.0' into dev_v1.0.1

sop-business/src/main/java/com/qmth/sop/business/entity/SysUser.java

@@ -76,6 +76,10 @@ public class SysUser extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "来源，SYSTEM：系统自带，ARCHIVES：档案")
     private UserSourceEnum source;
 
+    @ApiModelProperty(value = "供应商id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+
     @ApiModelProperty("软通智服用户同步状态")
     private RtzfSyncStatusEnum rtzfSyncStatus;
 
@@ -221,4 +225,12 @@ public class SysUser extends BaseEntity implements Serializable {
     public void setRtzfSyncStatus(RtzfSyncStatusEnum rtzfSyncStatus) {
         this.rtzfSyncStatus = rtzfSyncStatus;
     }
+
+    public Long getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(Long supplierId) {
+        this.supplierId = supplierId;
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBUserArchivesServiceImpl.java

@@ -196,6 +196,7 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
         tbUserArchives.setEducation(education);
         tbUserArchives.setMobileNumber(mobileNumber);
         tbUserArchives.setEmail(email);
+        tbUserArchives.setEnable(true);
         tbUserArchives.setBasePhotoPath(basePhotoPath);
         // 档案表编辑
         Long userId = null;

sop-business/src/main/java/com/qmth/sop/business/sync/FxxkApiUtils.java

@@ -220,7 +220,7 @@ public class FxxkApiUtils {
 //            Map<String, Object> filterMap2 = new HashMap<>();
 //            filterMap2.put("field_name", "name");
 //            List<String> fieldValues2 = new ArrayList<>();
-//            fieldValues2.add("Od-2023-10-2001");
+//            fieldValues2.add("Od-2023-11-0903");
 //            filterMap2.put("field_values", fieldValues2);
 //            filterMap2.put("operator", "EQ");
 //            filterMapList.add(filterMap2);

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -444,4 +444,12 @@ ALTER TABLE sys_device_model
 ALTER TABLE sys_device
     DROP INDEX sys_device_un_device_code ,
     ADD UNIQUE INDEX sys_device_un_serial_no (serial_no);
-;
+;
+
+-- 2023-11-30
+ALTER TABLE sys_supplier
+    ADD UNIQUE INDEX sys_supplier_un_name (name);
+;
+
+ALTER TABLE sys_user
+    ADD COLUMN supplier_id BIGINT NULL COMMENT '供应商id' AFTER source;

sop-common/src/main/java/com/qmth/sop/common/enums/FieldUniqueEnum.java

@@ -61,7 +61,9 @@ public enum FieldUniqueEnum {
 
     t_b_user_archives_allocation_un("派单编号-人员档案id"),
 
-    t_b_user_archives_supplier_un("人员档案id-供应商id");
+    t_b_user_archives_supplier_un("人员档案id-供应商id"),
+
+    sys_supplier_un_name("供应商名称");
 
     private String title;