개정판 a1142a6b
#00000 Debug에서 DevDoftech/Hyosung를 병행하여 Debug하도록 수정
- Web.config/Web.Debug.config/Web.Debug_DevDoftech.config/Web.Debug_HyoSung.config
- 솔루션 구성을 선택하여 각각 Debug
- Kcom_api에서 사용자 정보를 MS SQL 쿼리로 가져와서 사용하도록 수정( EF의 오류 방지)
Change-Id: I7c64e3f99a18dd29d91036a99604401f24c469d8
| KCOM_API/ServiceDeepView.svc.cs | ||
|---|---|---|
| 235 | 235 |
string originFile = ""; |
| 236 | 236 |
string targetFile = ""; |
| 237 | 237 |
|
| 238 |
string sFolder = originDocItem_ID.All(char.IsDigit) ? (Convert.ToUInt32(originDocItem_ID) / 100).ToString() : (originDocItem_ID.Length >= 5 ? originDocItem_ID.Substring(0, 5) : originDocItem_ID); |
|
| 238 |
string sOriginFolder = originDocItem_ID.All(char.IsDigit) ? (Convert.ToUInt32(originDocItem_ID) / 100).ToString() : (originDocItem_ID.Length >= 5 ? originDocItem_ID.Substring(0, 5) : originDocItem_ID); |
|
| 239 |
string sTagetFolder = targetDocItem_ID.All(char.IsDigit) ? (Convert.ToUInt32(targetDocItem_ID) / 100).ToString() : (targetDocItem_ID.Length >= 5 ? targetDocItem_ID.Substring(0, 5) : targetDocItem_ID); |
|
| 240 |
|
|
| 239 | 241 |
if (Boolean.Parse(isInternalAddress)) |
| 240 | 242 |
{
|
| 241 |
originFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, sFolder, originDocItem_ID, originPageNo); |
|
| 242 |
targetFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, sFolder, targetDocItem_ID, targetPageNo); |
|
| 243 |
originFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, sOriginFolder, originDocItem_ID, originPageNo);
|
|
| 244 |
targetFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, sTagetFolder, targetDocItem_ID, targetPageNo);
|
|
| 243 | 245 |
} |
| 244 | 246 |
else |
| 245 | 247 |
{
|
| ... | ... | |
| 692 | 694 |
_ColorsProperties = (from property in kcomEntity.PROPERTIES |
| 693 | 695 |
where property.TYPE == "DisplayColor" |
| 694 | 696 |
select property).ToList(); |
| 695 |
} |
|
| 697 |
} |
|
| 698 |
|
|
| 699 |
bool IsProjectNoPass = Properties.Settings.Default.IsProjectNoPass; |
|
| 696 | 700 |
|
| 697 | 701 |
foreach (var item in _result) |
| 698 | 702 |
{
|
| 699 |
var _member = entity.MEMBER.Where(member => member.ID == item.UserID && member.PROJECT_NO == ProjectNo).FirstOrDefault(); |
|
| 703 |
string query = "SELECT members.ID,members.NAME,members.DEPARTMENT FROM CIEntities.MEMBER as members where members.ID = @userId"; |
|
| 704 |
|
|
| 705 |
System.Data.Objects.ObjectQuery<System.Data.Common.DbDataRecord> memberQuery |
|
| 706 |
= entity.CreateQuery<System.Data.Common.DbDataRecord>(query,new System.Data.Objects.ObjectParameter("userId",item.UserID));
|
|
| 700 | 707 |
|
| 701 |
if (_member != null)
|
|
| 708 |
if (memberQuery.Count() > 0)
|
|
| 702 | 709 |
{
|
| 703 |
item.UserName = _member.NAME; |
|
| 704 |
item.Depatment = _member.DEPARTMENT; |
|
| 710 |
string userName = memberQuery.First()["NAME"]?.ToString().Trim(); |
|
| 711 |
string depatment = memberQuery.First()["DEPARTMENT"]?.ToString().Trim(); |
|
| 712 |
|
|
| 713 |
item.UserName = userName; |
|
| 714 |
item.Depatment = depatment; |
|
| 705 | 715 |
} |
| 706 | 716 |
|
| 707 | 717 |
if (_ColorsProperties.Count > 0) |
| ... | ... | |
| 802 | 812 |
|
| 803 | 813 |
foreach (var item in _result) |
| 804 | 814 |
{
|
| 805 |
var _member = entity.MEMBER.Where(member => member.ID == item.UserID); |
|
| 815 |
string query = "SELECT members.ID,members.NAME,members.DEPARTMENT FROM CIEntities.MEMBER as members where members.ID = @userId"; |
|
| 816 |
|
|
| 817 |
System.Data.Objects.ObjectQuery<System.Data.Common.DbDataRecord> memberQuery |
|
| 818 |
= entity.CreateQuery<System.Data.Common.DbDataRecord>(query, new System.Data.Objects.ObjectParameter("userId", item.UserID));
|
|
| 806 | 819 |
|
| 807 |
if (_member.Count() > 0)
|
|
| 820 |
if (memberQuery.Count() > 0)
|
|
| 808 | 821 |
{
|
| 809 |
item.UserName = _member.First().NAME; |
|
| 810 |
item.Depatment = _member.First().DEPARTMENT; |
|
| 822 |
|
|
| 823 |
string userName = memberQuery.First()["NAME"]?.ToString().Trim(); |
|
| 824 |
string depatment = memberQuery.First()["DEPARTMENT"]?.ToString().Trim(); |
|
| 825 |
|
|
| 826 |
item.UserName = userName; |
|
| 827 |
item.Depatment = depatment; |
|
| 811 | 828 |
} |
| 812 | 829 |
|
| 813 | 830 |
if (_ColorsProperties.Count > 0) |
내보내기 Unified diff
