From 2ab088b4c03610d066c119b2bc9d6141126ef15c Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Tue, 14 Apr 2026 16:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=84=8F=E8=AF=86=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=20=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E5=81=9A?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=20=E4=BA=BA=E5=91=98=E5=AF=BC=E5=85=A5=20=20?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=A7=92=E8=89=B2=E5=88=97=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=B7=BB=E5=8A=A0=E3=80=90App?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/FMUserController.cs           | 36 +++++++++----------
 .../SEController/2SETrainSurveyController.cs  |  4 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs
index 179ea67..42b71f5 100644
--- a/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs
+++ b/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs
@@ -789,7 +789,7 @@ namespace APT.BS.WebApi.Controllers.Api
                 Msg = "未获取到导入数据";
                 throw new Exception(Msg);
             }
-            List<int> listNotEmpty = new List<int>() { 0, 7, 8, 9, 12, 16 };
+            List<int> listNotEmpty = new List<int>() { 0, 7, 8, 9, 12 };//, 16
 
             //使用组织  T_FM_DEPARTMENT 
             //物料类型  T_TI_SAFE_PDT_COST_RECORD_TYPE   T_TI_COST_TYPE
@@ -907,9 +907,9 @@ namespace APT.BS.WebApi.Controllers.Api
             List<int> listApproveRoleIndex = new List<int>();
 
             //操作角色   16
-            string strRole = string.Empty;
+            //string strRole = string.Empty;
             char[] charSplit = new char[] { ';', '；' };
-            List<string> listStrRole = new List<string>();
+            List<string> listStrRole = new List<string>() { "App用户" };//操作角色列删除 配置默认角色 “App用户”
             List<T_FM_ROLE> listRoleItem = new List<T_FM_ROLE>();
             List<string> listRoleName = new List<string>();
             List<int> listRoleIndex = new List<int>();
@@ -988,7 +988,7 @@ namespace APT.BS.WebApi.Controllers.Api
                 #region    不能为空
 
                 List<string> listi = null;
-                for (int j = 0; j < 17; j++)
+                for (int j = 0; j < 16; j++)//17
                 {
                     if (!listNotEmpty.Contains(j))
                         continue;
@@ -1293,22 +1293,22 @@ namespace APT.BS.WebApi.Controllers.Api
                     else
                     {
                         modelApproveRole = null;
-                    }
-
+                    }
+
                     #endregion
-
+
                     #region   操作角色   16
-
-                    strRole = dtSource.Rows[i][16].ToString().Trim();
-                    if (!string.IsNullOrEmpty(strRole))
-                    {
-                        listStrRole = strRole.Split(charSplit, StringSplitOptions.RemoveEmptyEntries).ToList();
-                        listRoleItem = listRole.FindAll(e => listStrRole.Contains(e.NAME)).ToList();
-                    }
-                    else
-                    {
-                        listRoleItem = null;
-                    }
+
+                    //strRole = dtSource.Rows[i][16].ToString().Trim();
+                    //if (!string.IsNullOrEmpty(strRole))
+                    //{
+                    //    listStrRole = strRole.Split(charSplit, StringSplitOptions.RemoveEmptyEntries).ToList();
+                    listRoleItem = listRole.FindAll(e => listStrRole.Contains(e.NAME)).ToList();
+                    //}
+                    //else
+                    //{
+                    //    listRoleItem = null;
+                    //}
 
                     #endregion
 
diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs
index 41d5445..3f4285d 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs
@@ -83,12 +83,12 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                 List<T_SE_TRAIN_SURVEY_LIST_DEMAND> Nav_Demands = null;
                 List<T_FM_NOTIFICATION_TASK> noticeTask = null;
 
-                var listUserID = Demands.Where(e => e.USER_ID.HasValue).Select(e => e.USER_ID.Value);
+                var listUserID = Demands.Where(e => !e.IS_DELETED && e.USER_ID.HasValue).Select(e => e.USER_ID.Value);
                 var listUserIDCheck = listUserID.Distinct();
                 var ccCheck = listUserID.Count() - listUserIDCheck.Count();
                 if (ccCheck > 0)
                 {
-                    throw new Exception("调查人员不能重复（"+ ccCheck + "人）！");
+                    throw new Exception("调查人员不能重复（" + ccCheck + "人）！");
                 }
                 if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
                 {