Merge branch 'develop' into bin2107

src/main/java/com/style24/persistence/mybatis/shop/TsaStock.xml

@@ -9,7 +9,7 @@
 		              <when test='search != null and search == "searchGoodsCd"'>
 		        AND (
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
-		               UPPER(G.GOODS_CD) LIKE CONCAT(#{item},'%') 
+		               G.GOODS_CD LIKE CONCAT(#{item},'%') 
 		              </foreach>
 		             )
 		              </when>
@@ -41,12 +41,12 @@
 		        AND 1 = 1
 		              </when>
 		              <otherwise>
-		        AND UPPER(G.REG_ID) LIKE CONCAT(#{item},'%')
+		        AND 1 = 1
 		              </otherwise>
 		            </choose>
 		        </if>
 		        <if test="goodsCd != null and goodsCd != ''">
-		        AND UPPER(G.GOODS_CD) LIKE CONCAT(#{goodsCd},'%')
+		        AND G.GOODS_CD LIKE CONCAT(#{goodsCd},'%')
 		        </if>
 		         <if test="goodsNm != null and goodsNm != ''">
 		        AND UPPER(G.GOODS_NM) LIKE CONCAT(#{goodsNm},'%')

src/main/webapp/WEB-INF/views/display/GoodsCategoryForm.html

@@ -322,8 +322,12 @@
 			{headerName: "기존품목코드", field: "itemkindCd", width: 150, cellClass: 'text-center' },
 			{headerName: "품목", field: "itemkindNm", width: 150, cellClass: 'text-center',
 				cellRenderer: function (params) {
-					return params.value.replaceAll(">", ">");
-				}
+					if (gagajf.isNull( params.value)){
+						return  params.value;
+					}else{
+						return  params.value.replaceAll(">", ">");
+					}
+				}	
 			},
 			{headerName: "전시재고", field: "stockQtySum", width: 120, cellClass: 'text-right',
 				valueFormatter: function(params) {	return params.value.addComma();},

src/main/webapp/WEB-INF/views/display/ItemkindCategoryForm.html

@@ -82,8 +82,12 @@
 		},
 		{headerName: "품목명", field: "itemkindNm", width: 300,
 			cellRenderer: function (params) {
-				return params.value.replaceAll(">", ">");
-			}
+				if (gagajf.isNull( params.value)){
+					return  params.value;
+				}else{
+					return  params.value.replaceAll(">", ">");
+				}
+			}	
 		}
 	];
 	
@@ -93,7 +97,15 @@
 			headerName: "카테고리구분", field: "cateGb", width: 120, cellClass: 'text-center',
 			cellRenderer: function (params) { return gagaAgGrid.lookupValue(cateGbList, params.value); }
 		},
-		{headerName: "FULL카테고리명", field: "fullCateNm", width: 400},
+		{headerName: "FULL카테고리명", field: "fullCateNm", width: 400,
+			cellRenderer: function (params) {
+				if (gagajf.isNull( params.value)){
+					return  params.value;
+				}else{
+					return  params.value.replaceAll(">", ">");
+				}
+			}	
+		},
 		{headerName: "카데고리명", field: "cateNm", width: 150, cellClass: 'text-center', hide: true},
 		{headerName: "분류레벨", field: "clsLvl", width: 100, hide: true}
 	];
@@ -109,13 +121,21 @@
 		{headerName: "카테고리번호", field: "cateNo", width: 150, cellClass: 'text-center'},
 		{headerName: "FULL카테고리번호", field: "fullCateNo", width: 200,
 			cellRenderer: function (params) {
-				return params.value.replaceAll(">", ">");
-			}
+				if (gagajf.isNull( params.value)){
+					return  params.value;
+				}else{
+					return  params.value.replaceAll(">", ">");
+				}
+			}	
 		},
 		{headerName: "FULL카테고리명", field: "fullCateNm", width: 400,
 			cellRenderer: function (params) {
-				return params.value.replaceAll(">", ">");
-			}
+				if (gagajf.isNull( params.value)){
+					return  params.value;
+				}else{
+					return  params.value.replaceAll(">", ">");
+				}
+			}	
 		}
 	];
 	

src/main/webapp/WEB-INF/views/goods/GoodsItemkindForm.html

@@ -194,8 +194,12 @@
 		{headerName: "상품명", field: "goodsNm", width: 200, cellClass: 'text-left'},
 		{headerName: "품목명", field: "itemkindNm", width: 250, cellClass: 'text-left',
 			cellRenderer: function (params) {
-				return params.value.replaceAll(">", ">");
-			}
+				if (gagajf.isNull( params.value)){
+					return  params.value;
+				}else{
+					return  params.value.replaceAll(">", ">");
+				}
+			}	
 		},
 		{headerName: "기존품목코드", field: "itemkindCd", width: 150, cellClass: 'text-center' },
 		{headerName: "변경품목코드", field: "itemkindCdNew", width: 150, cellClass: 'text-center', editable : true,

src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -472,7 +472,11 @@
 		},
 		{headerName: "품목", field: "itemkindNm", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
-				return params.value.replaceAll(">", ">");
+				if (gagajf.isNull( params.value)){
+					return  params.value;
+				}else{
+					return  params.value.replaceAll(">", ">");
+				}
 			}
 		},
 		{headerName: "전시재고", field: "stockQtySum", width: 120, cellClass: 'text-right',

src/main/webapp/WEB-INF/views/goods/GoodsPopupListForm.html

@@ -265,8 +265,11 @@
 		{headerName: "상품명", field: "goodsNm", width: 200, cellClass: 'text-left'},
 		{headerName: "품목", field: "itemkindNm", width: 150, cellClass: 'text-left', 
 			cellRenderer: function (params) {
-				return params.value.replaceAll(">", ">");
-			}
+				if (gagajf.isNull( params.value)){
+					return  params.value;
+				}else{
+					return  params.value.replaceAll(">", ">");
+				}
 		},
 		{headerName: "전시재고", field: "stockQtySum", width: 100, cellClass: 'text-right',
 			valueFormatter: function(params) {	return params.value.addComma();}

src/main/webapp/WEB-INF/views/goods/ItemkindBaseForm.html

@@ -61,8 +61,12 @@
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 50, required: true },
 			cellRenderer: function (params) {
-				return params.value.replaceAll(">", ">");
-			}
+				if (gagajf.isNull( params.value)){
+					return  params.value;
+				}else{
+					return  params.value.replaceAll(">", ">");
+				}
+			}	
 		},
 		/* {headerName: "품목영문명", field: "itemkindEnm", width: 350, cellClass: 'text-center',
 			cellEditor: 'textCellEditor',

src/main/webapp/WEB-INF/views/marketing/PollListForm.html

@@ -234,7 +234,7 @@
 		<input type="hidden" name="pollQsq" value=""/>
 	</td>
 	<td>
-		<input type="text" name="pollQtitle" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQtitle" class="type-text" style="width: 100%;"onkeyup="chkChar(this)"/>
 	</td>
 	<td>
 		<select name="pollQtype">
@@ -242,34 +242,34 @@
 		</select>
 	</td>
 	<td>
-		<input type="text" name="pollQval1" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQval1" class="type-text" onkeyup="chkChar(this)" style="width: 100%;"/>
 	</td>
 	<td>
-		<input type="text" name="pollQval2" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQval2" class="type-text" onkeyup="chkChar(this)" style="width: 100%;"/>
 	</td>
 	<td>
-		<input type="text" name="pollQval3" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQval3" class="type-text" onkeyup="chkChar(this)"style="width: 100%;"/>
 	</td>
 	<td>
-		<input type="text" name="pollQval4" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQval4" class="type-text" onkeyup="chkChar(this)" style="width: 100%;"/>
 	</td>
 	<td>
-		<input type="text" name="pollQval5" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQval5" class="type-text" onkeyup="chkChar(this)" style="width: 100%;"/>
 	</td>
 	<td>
-		<input type="text" name="pollQval6" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQval6" class="type-text" onkeyup="chkChar(this)" style="width: 100%;"/>
 	</td>
 	<td>
-		<input type="text" name="pollQval7" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQval7" class="type-text" onkeyup="chkChar(this)" style="width: 100%;"/>
 	</td>
 	<td>
-		<input type="text" name="pollQval8" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQval8" class="type-text" onkeyup="chkChar(this)" style="width: 100%;"/>
 	</td>
 	<td>
-		<input type="text" name="pollQval9" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQval9" class="type-text" onkeyup="chkChar(this)" style="width: 100%;"/>
 	</td>
 	<td>
-		<input type="text" name="pollQval10" class="type-text" style="width: 100%;"/>
+		<input type="text" name="pollQval10" class="type-text" onkeyup="chkChar(this)" style="width: 100%;"/>
 	</td>
 	</tr>
 </table>
@@ -771,6 +771,14 @@
 		}
 	}
 
+	function chkChar(obj){
+	    var RegExp = /[\{\}\[\]\/?.,;:|\)*~`!^\-_+┼<>@\#$%&\'\"\\\(\=]/gi;	//정규식 구문
+	    if (RegExp.test(obj.value)) {
+	      // 특수문자 모두 제거    
+	      obj.value = obj.value.replace(RegExp , '');
+	    }
+  	}
+	 
 	$('#stTimeHour').on('change', function() {
 		$('#stTime').val($(this).val() + ':' + $('#stTimeMin').val() + ':' + '00');
 	});

src/main/webapp/WEB-INF/views/stock/GoodsSizeStockForm.html

@@ -218,8 +218,12 @@
 		{headerName: "상품명", field: "goodsNm", width: 200, cellClass: 'text-left'},
 		{headerName: "품목", field: "itemkindNm", width: 180, cellClass: 'text-left',
 			cellRenderer: function (params) {
-				return params.value.replaceAll(">", ">");
-			}
+				if (gagajf.isNull( params.value)){
+					return  params.value;
+				}else{
+					return  params.value.replaceAll(">", ">");
+				}
+			}	
 		},
 		{headerName: "상품상태", field: "goodsStat" , width: 120, cellClass: 'text-center',
 			cellEditorParams: { values: gagaAgGrid.extractValues(goodsStatList) },