개정판 0af41bf0
issue #000: 등록된 사용자 체크 로직 수정
Change-Id: If9dc00d4cf6e124ac6c1d64699735187014c3e92
| KCOM/Messenger/ConversationView.xaml.cs | ||
|---|---|---|
| 194 | 194 |
main = this.ParentOfType<MainWindow>(); |
| 195 | 195 |
if (App.ParameterMode) |
| 196 | 196 |
{
|
| 197 |
ClickAnchorCommand = new Telerik.Windows.Controls.DelegateCommand(SaveAuthorization); |
|
| 198 |
if (string.IsNullOrEmpty(App.UserName)) |
|
| 197 |
try |
|
| 199 | 198 |
{
|
| 200 |
Logger.sendReqLog("GetMember: ", App.ViewInfo.ProjectNO + "," + App.ViewInfo.UserID, 1);
|
|
| 201 |
App.UserName = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMember(App.ViewInfo.ProjectNO, App.ViewInfo.UserID).NAME; |
|
| 202 |
if (App.UserName != null || App.UserName != "") |
|
| 199 |
ClickAnchorCommand = new Telerik.Windows.Controls.DelegateCommand(SaveAuthorization); |
|
| 200 |
if (string.IsNullOrEmpty(App.UserName) && Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.userData == null) |
|
| 203 | 201 |
{
|
| 204 |
Logger.sendResLog("AddMessage", "TRUE", 1);
|
|
| 202 |
var member = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMember(App.ViewInfo.ProjectNO, App.ViewInfo.UserID); |
|
| 203 |
if (member != null) |
|
| 204 |
App.UserName = member.NAME; |
|
| 205 | 205 |
} |
| 206 |
else
|
|
| 206 |
if (Common.ViewerDataModel.Instance.k_talkMessageSet.Count() == 0)
|
|
| 207 | 207 |
{
|
| 208 |
Logger.sendResLog("AddMessage", "FALSE", 1);
|
|
| 208 |
Logger.sendReqLog("GetMessage: ", App.ViewInfo.ProjectNO + "," + App.ViewInfo.DocumentItemID, 1);
|
|
| 209 |
List<KCOMDataModel.DataModel.TALK> messagelist = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMessage(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID); |
|
| 210 |
Logger.sendResLog("GetMessage", "messagelist.Count:" + messagelist.Count(), 1);
|
|
| 211 |
|
|
| 212 |
messagelist.ForEach(a => |
|
| 213 |
{
|
|
| 214 |
Common.ViewerDataModel.Instance.k_talkMessageSet.Add(a); |
|
| 215 |
}); |
|
| 216 |
(lstMessage.Parent as ScrollViewer).ScrollToEnd(); |
|
| 209 | 217 |
} |
| 218 |
tbContent.KeyDown += async (s, ea) => await OnKeyDownHandler(s, ea); |
|
| 210 | 219 |
} |
| 211 |
if (Common.ViewerDataModel.Instance.k_talkMessageSet.Count() == 0)
|
|
| 220 |
catch (Exception)
|
|
| 212 | 221 |
{
|
| 213 |
Logger.sendReqLog("GetMessage: ", App.ViewInfo.ProjectNO + "," + App.ViewInfo.DocumentItemID, 1);
|
|
| 214 |
List<KCOMDataModel.DataModel.TALK> messagelist = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMessage(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID); |
|
| 215 |
if (messagelist.Count() > 0) |
|
| 216 |
{
|
|
| 217 |
Logger.sendResLog("GetMessage", "TRUE", 1);
|
|
| 218 |
} |
|
| 219 |
else |
|
| 220 |
{
|
|
| 221 |
Logger.sendResLog("GetMessage", "FALSE", 1);
|
|
| 222 |
} |
|
| 223 |
messagelist.ForEach(a => |
|
| 224 |
{
|
|
| 225 |
Common.ViewerDataModel.Instance.k_talkMessageSet.Add(a); |
|
| 226 |
}); |
|
| 227 |
(lstMessage.Parent as ScrollViewer).ScrollToEnd(); |
|
| 222 |
throw; |
|
| 228 | 223 |
} |
| 229 |
tbContent.KeyDown += async (s, ea) => await OnKeyDownHandler(s, ea); |
|
| 230 |
|
|
| 231 | 224 |
} |
| 232 | 225 |
} |
| 233 | 226 |
|
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 730 | 730 |
// Console.WriteLine(task.Result); |
| 731 | 731 |
// } |
| 732 | 732 |
//}); |
| 733 |
MarkusLicenseProxy.Invoke<string>("ConnectionMarkus", App.ViewInfo.UserID).ContinueWith(task =>
|
|
| 733 |
MarkusLicenseProxy.Invoke<string>("ConnectionMarkus", App.ViewInfo.UserID,App.ViewInfo.ProjectNO).ContinueWith(task =>
|
|
| 734 | 734 |
{
|
| 735 | 735 |
if (task.IsFaulted) |
| 736 | 736 |
{
|
| ... | ... | |
| 742 | 742 |
{
|
| 743 | 743 |
case "2": |
| 744 | 744 |
{
|
| 745 |
MessageBox.Show("권한이 없습니다.");
|
|
| 746 |
System.Diagnostics.Process.GetCurrentProcess().Kill(); |
|
| 745 |
var result = MessageBox.Show("권한이 없습니다.");
|
|
| 746 |
if (result == MessageBoxResult.OK) |
|
| 747 |
System.Diagnostics.Process.GetCurrentProcess().Kill(); |
|
| 747 | 748 |
} |
| 748 | 749 |
break; |
| 749 | 750 |
case "404": |
| 750 | 751 |
{
|
| 751 |
MessageBox.Show("등록된 사용자가 아닙니다.");
|
|
| 752 |
System.Diagnostics.Process.GetCurrentProcess().Kill(); |
|
| 752 |
var result = MessageBox.Show("등록된 사용자가 아닙니다.");
|
|
| 753 |
if(result == MessageBoxResult.OK) |
|
| 754 |
System.Diagnostics.Process.GetCurrentProcess().Kill(); |
|
| 753 | 755 |
} |
| 754 | 756 |
break; |
| 755 | 757 |
} |
| KCOMDataModel/DataModel/CIModel.Designer.cs | ||
|---|---|---|
| 3298 | 3298 |
private Nullable<global::System.Int32> _ISLICENSE; |
| 3299 | 3299 |
partial void OnISLICENSEChanging(Nullable<global::System.Int32> value); |
| 3300 | 3300 |
partial void OnISLICENSEChanged(); |
| 3301 |
|
|
| 3302 |
/// <summary> |
|
| 3303 |
/// 사용 가능한 메타데이터 설명서가 없습니다. |
|
| 3304 |
/// </summary> |
|
| 3305 |
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=true)] |
|
| 3306 |
[DataMemberAttribute()] |
|
| 3307 |
public global::System.String PROJECT_NO |
|
| 3308 |
{
|
|
| 3309 |
get |
|
| 3310 |
{
|
|
| 3311 |
return _PROJECT_NO; |
|
| 3312 |
} |
|
| 3313 |
set |
|
| 3314 |
{
|
|
| 3315 |
OnPROJECT_NOChanging(value); |
|
| 3316 |
ReportPropertyChanging("PROJECT_NO");
|
|
| 3317 |
_PROJECT_NO = StructuralObject.SetValidValue(value, true); |
|
| 3318 |
ReportPropertyChanged("PROJECT_NO");
|
|
| 3319 |
OnPROJECT_NOChanged(); |
|
| 3320 |
} |
|
| 3321 |
} |
|
| 3322 |
private global::System.String _PROJECT_NO; |
|
| 3323 |
partial void OnPROJECT_NOChanging(global::System.String value); |
|
| 3324 |
partial void OnPROJECT_NOChanged(); |
|
| 3301 | 3325 |
|
| 3302 | 3326 |
#endregion |
| 3303 | 3327 |
|
| KCOMDataModel/DataModel/CIModel.edmx | ||
|---|---|---|
| 146 | 146 |
<Property Name="CREATE_DATETIME" Type="datetime" /> |
| 147 | 147 |
<Property Name="MODIFIED_DATETIME" Type="datetime" /> |
| 148 | 148 |
<Property Name="ISLICENSE" Type="int" /> |
| 149 |
<Property Name="PROJECT_NO" Type="nvarchar" MaxLength="50" /> |
|
| 149 | 150 |
</EntityType> |
| 150 | 151 |
<EntityType Name="MEMBER_DEPT_COLOR"> |
| 151 | 152 |
<Key> |
| ... | ... | |
| 487 | 488 |
<Property Name="CREATE_DATETIME" Type="DateTime" Precision="3" /> |
| 488 | 489 |
<Property Name="MODIFIED_DATETIME" Type="DateTime" Precision="3" /> |
| 489 | 490 |
<Property Name="ISLICENSE" Type="Int32" /> |
| 491 |
<Property Name="PROJECT_NO" Type="String" MaxLength="50" FixedLength="false" Unicode="true" /> |
|
| 490 | 492 |
</EntityType> |
| 491 | 493 |
<EntityType Name="SIGN_INFO"> |
| 492 | 494 |
<Key> |
| ... | ... | |
| 705 | 707 |
<EntitySetMapping Name="MEMBER"> |
| 706 | 708 |
<EntityTypeMapping TypeName="CIModel.MEMBER"> |
| 707 | 709 |
<MappingFragment StoreEntitySet="MEMBER"> |
| 710 |
<ScalarProperty Name="PROJECT_NO" ColumnName="PROJECT_NO" /> |
|
| 708 | 711 |
<ScalarProperty Name="ISLICENSE" ColumnName="ISLICENSE" /> |
| 709 | 712 |
<ScalarProperty Name="MODIFIED_DATETIME" ColumnName="MODIFIED_DATETIME" /> |
| 710 | 713 |
<ScalarProperty Name="CREATE_DATETIME" ColumnName="CREATE_DATETIME" /> |
| KCOM_API/ServiceDeepView.svc.cs | ||
|---|---|---|
| 2192 | 2192 |
using (CIEntities Entity = new CIEntities(ConnectStringBuilder.ProjectCIConnectString(project_no).ToString())) |
| 2193 | 2193 |
{
|
| 2194 | 2194 |
var tmp = (from member in Entity.MEMBER |
| 2195 |
where member.ID == user_id |
|
| 2195 |
where member.ID == user_id && member.PROJECT_NO == project_no
|
|
| 2196 | 2196 |
select member).FirstOrDefault(); |
| 2197 | 2197 |
rstmember.DEPARTMENT = tmp.DEPARTMENT; |
| 2198 | 2198 |
rstmember.ID = tmp.ID; |
내보내기 Unified diff
